Commit Graph

43 Commits

Author SHA256 Message Date
Aleksa Sarai
6ef967f032 Accepting request 560090 from home:dimstar:Factory
- Fix build with RPM 4.14: exclude is not meant for files to NOT be
  packaged, but should only be used if the files are to be excluded
  from a glob when they end up in a different package. Rather
  remove the unwanted files in the install section.

OBS-URL: https://build.opensuse.org/request/show/560090
OBS-URL: https://build.opensuse.org/package/show/Virtualization:containers/containerd?expand=0&rev=68
2018-01-04 05:13:12 +00:00
Aleksa Sarai
3ca9f987ae Accepting request 558085 from home:cyphar:containers:docker_v17.09_ce
- Update to Docker v17.09.1_ce. Upstream changelog:
  https://github.com/docker/docker-ce/releases/tag/v17.09.1-ce
- Removed patches (merged upstream):
  - bsc1045628-0001-devicemapper-remove-container-rootfs-mountPath-after.patch
  - bsc1066210-0001-vendor-update-to-github.com-vbatts-tar-split-v0.10.2.patch
  - bsc1066801-0001-oci-add-proc-scsi-to-masked-paths.patch
- Update to Docker v17.09.0_ce. Upstream changelog:
  https://github.com/docker/docker-ce/releases/tag/v17.09.0-ce
- Rebased patches:
  * bsc1021227-0001-pkg-devmapper-dynamically-load-dm_task_deferred_remo.patch
  * bsc1045628-0001-devicemapper-remove-container-rootfs-mountPath-after.patch
  * bsc1055676-0001-daemon-oci-obey-CL_UNPRIVILEGED-for-user-namespaced-.patch
  * secrets-0001-daemon-allow-directory-creation-in-run-secrets.patch
  * secrets-0002-SUSE-implement-SUSE-container-secrets.patch
- Removed patches (merged upstream):
  - bsc1064781-0001-Allow-to-override-build-date.patch

OBS-URL: https://build.opensuse.org/request/show/558085
OBS-URL: https://build.opensuse.org/package/show/Virtualization:containers/containerd?expand=0&rev=66
2017-12-19 03:42:51 +00:00
Aleksa Sarai
8e706de123 Accepting request 544764 from home:RBrownSUSE:branches:Virtualization:containers
Replace references to /var/adm/fillup-templates with new %_fillupdir macro (boo#1069468)

OBS-URL: https://build.opensuse.org/request/show/544764
OBS-URL: https://build.opensuse.org/package/show/Virtualization:containers/containerd?expand=0&rev=64
2017-11-24 10:06:55 +00:00
Aleksa Sarai
ec48492ea8 Accepting request 536960 from home:cyphar:containers:containerd_fix
- Set --start-timeout=2m by default to match upstream. bsc#1064926

OBS-URL: https://build.opensuse.org/request/show/536960
OBS-URL: https://build.opensuse.org/package/show/Virtualization:containers/containerd?expand=0&rev=62
2017-10-26 19:38:40 +00:00
Aleksa Sarai
9b931700e9 Accepting request 536946 from home:cyphar:containers:containerd_version
- Use the upstream makefile so that Docker can get the commit ID in `docker
  info`. This also will avoid possible future warnings being spit out like
  bsc#1065109 and boo#1053532.
- Backport https://github.com/containerd/containerd/pull/1686, which is
  required for the above fix. bsc#1065109 boo#1053532
  + bsc1065109-0001-makefile-add-support-for-build_flags.patch

OBS-URL: https://build.opensuse.org/request/show/536946
OBS-URL: https://build.opensuse.org/package/show/Virtualization:containers/containerd?expand=0&rev=61
2017-10-26 18:00:35 +00:00
Aleksa Sarai
c4e35ee0d6 Accepting request 534870 from home:cyphar:containers:docker-ce_v17.07
Correct a series of minor issues in the v17.07.0_ce update, mainly related to
changelog entries and the versions of certain packages not being correct.

OBS-URL: https://build.opensuse.org/request/show/534870
OBS-URL: https://build.opensuse.org/package/show/Virtualization:containers/containerd?expand=0&rev=59
2017-10-18 06:27:22 +00:00
Aleksa Sarai
0f71b6b267 Accepting request 514245 from home:cyphar:containers:docker_bsc1051429
- Use -buildmode=pie for tests and binary build. bsc#1048046 bsc#1051429

This also includes some various improvements to the packaging of runc,
containerd and docker-runc.

OBS-URL: https://build.opensuse.org/request/show/514245
OBS-URL: https://build.opensuse.org/package/show/Virtualization:containers/containerd?expand=0&rev=56
2017-08-11 12:10:01 +00:00
Thomas Hipp
2fc81ff63a Accepting request 508699 from home:thipp:branches:Virtualization:containers
- change dependency to docker-runc

OBS-URL: https://build.opensuse.org/request/show/508699
OBS-URL: https://build.opensuse.org/package/show/Virtualization:containers/containerd?expand=0&rev=54
2017-07-10 11:38:55 +00:00
Jordi Massaguer
df1be9dbeb Accepting request 492914 from home:jordimassaguerpla:branch:V:c:fix_go_req_in_test_docker
OBS-URL: https://build.opensuse.org/request/show/492914
OBS-URL: https://build.opensuse.org/package/show/Virtualization:containers/containerd?expand=0&rev=52
2017-05-04 19:02:51 +00:00
Jordi Massaguer
3933ae2e85 Accepting request 492508 from home:jordimassaguerpla:branch:V:c:containerd:fix_golang_req
- fix golang requirement to 1.7

OBS-URL: https://build.opensuse.org/request/show/492508
OBS-URL: https://build.opensuse.org/package/show/Virtualization:containers/containerd?expand=0&rev=51
2017-05-04 18:33:53 +00:00
Jordi Massaguer
f4003a9666 Accepting request 491892 from home:jengelh:branches:Virtualization:containers
- Replace %__-type macro indirections

OBS-URL: https://build.opensuse.org/request/show/491892
OBS-URL: https://build.opensuse.org/package/show/Virtualization:containers/containerd?expand=0&rev=50
2017-04-28 16:29:50 +00:00
Jordi Massaguer
f6ef450949 Accepting request 489585 from home:jordimassaguerpla:branch:V:c:update_docker_to_v17.04.0-ce
OBS-URL: https://build.opensuse.org/request/show/489585
OBS-URL: https://build.opensuse.org/package/show/Virtualization:containers/containerd?expand=0&rev=49
2017-04-20 10:54:04 +00:00
Jordi Massaguer
fa22ee39af Accepting request 487532 from home:jordimassaguerpla:branches:V:c:docker_with_go_1_7
OBS-URL: https://build.opensuse.org/request/show/487532
OBS-URL: https://build.opensuse.org/package/show/Virtualization:containers/containerd?expand=0&rev=48
2017-04-20 10:25:35 +00:00
Jordi Massaguer
b7e9874a22 Accepting request 487502 from home:cyphar:containers
- Set TasksMax=infinity to make sure runC doesn't start failing randomly.

OBS-URL: https://build.opensuse.org/request/show/487502
OBS-URL: https://build.opensuse.org/package/show/Virtualization:containers/containerd?expand=0&rev=46
2017-04-12 08:37:07 +00:00
Aleksa Sarai
7efe4a265a Accepting request 461896 from home:jordimassaguerpla:branch:Vc:update_docker_1_13
- update to docker 1.13.0 requirement

OBS-URL: https://build.opensuse.org/request/show/461896
OBS-URL: https://build.opensuse.org/package/show/Virtualization:containers/containerd?expand=0&rev=44
2017-03-05 03:06:22 +00:00
Jordi Massaguer
c7fd3b15c6 Accepting request 450292 from home:cyphar:containers
clean up containerd update as well [install was broken]

OBS-URL: https://build.opensuse.org/request/show/450292
OBS-URL: https://build.opensuse.org/package/show/Virtualization:containers/containerd?expand=0&rev=42
2017-01-16 09:37:31 +00:00
Aleksa Sarai
6fc641897a Accepting request 447027 from home:jordimassaguerpla:branch:V:c:update_docker_to_1_12_5
OBS-URL: https://build.opensuse.org/request/show/447027
OBS-URL: https://build.opensuse.org/package/show/Virtualization:containers/containerd?expand=0&rev=40
2016-12-19 14:01:27 +00:00
Jordi Massaguer
f911c03839 fix changelog: remove duplicated entries
OBS-URL: https://build.opensuse.org/package/show/Virtualization:containers/containerd?expand=0&rev=38
2016-11-28 16:45:28 +00:00
Jordi Massaguer
5ed7e77228 - fix runc version
fix bsc#1009961

OBS-URL: https://build.opensuse.org/package/show/Virtualization:containers/containerd?expand=0&rev=36
2016-11-24 16:09:56 +00:00
Jordi Massaguer
cb55a0ee9c Accepting request 441847 from home:jordimassaguerpla:branch:Vc:fix_runc_and_containerd_versioning
- fix version so that it contains a sequence number and zypper does
  not think is a downgrade

OBS-URL: https://build.opensuse.org/request/show/441847
OBS-URL: https://build.opensuse.org/package/show/Virtualization:containers/containerd?expand=0&rev=35
2016-11-24 12:49:04 +00:00
Jordi Massaguer
7aaf05459e Accepting request 437273 from home:jordimassaguerpla:branch:VC:fix_containerd_post_req
- fix bsc#1006368: docker/containerd is broken when installed by
  SuSE Studio in an appliance: We were missing the
    Requires(post): %fillup_prereq

OBS-URL: https://build.opensuse.org/request/show/437273
OBS-URL: https://build.opensuse.org/package/show/Virtualization:containers/containerd?expand=0&rev=33
2016-10-25 12:11:15 +00:00
Jordi Massaguer
8998deb22f - update runc requirement to 02f8fa7863dd3f82909a73e2061897828460d52f
(see RUNC_COMMIT in Dockerfile)

OBS-URL: https://build.opensuse.org/package/show/Virtualization:containers/containerd?expand=0&rev=32
2016-10-25 08:32:28 +00:00
Jordi Massaguer
597fb076b1 Accepting request 437082 from home:jordimassaguerpla:branch:VC:update_docker_12_2
OBS-URL: https://build.opensuse.org/request/show/437082
OBS-URL: https://build.opensuse.org/package/show/Virtualization:containers/containerd?expand=0&rev=31
2016-10-24 10:56:09 +00:00
Aleksa Sarai
1cdca70f6e Accepting request 428671 from home:jordimassaguerpla:branch:V:c:fix_go_arches_def
- fix go_arches definition: use global instead of define, otherwise
  it fails to build

OBS-URL: https://build.opensuse.org/request/show/428671
OBS-URL: https://build.opensuse.org/package/show/Virtualization:containers/containerd?expand=0&rev=29
2016-09-19 12:08:41 +00:00
Christian Brauner
323c73a2a3 Accepting request 422162 from home:jordimassaguerpla:branch:Vc:gcc_fails_with_GOPATH_empty
- Remove GOPATH at the end of the GOPATH assignment
  cause GOPATH is empty and if we do that, we get the path ""
  appended, which causes gcc6-go to complain

OBS-URL: https://build.opensuse.org/request/show/422162
OBS-URL: https://build.opensuse.org/package/show/Virtualization:containers/containerd?expand=0&rev=28
2016-08-25 16:01:25 +00:00
Christian Brauner
4aedd32e4b Accepting request 421576 from home:jordimassaguerpla:branch:V:c:add_go_arches_in_prjconf
- add go_arches in project configuration: this way, we can use the
  same spec file but decide in the project configuration if to
  use gc-go or gcc-go for some archs.

OBS-URL: https://build.opensuse.org/request/show/421576
OBS-URL: https://build.opensuse.org/package/show/Virtualization:containers/containerd?expand=0&rev=25
2016-08-24 12:33:46 +00:00
Christian Brauner
b5c589da55 Accepting request 421317 from Virtualization:containers:1.12-RC
- update to v2.3.0 (bsc#995058)

OBS-URL: https://build.opensuse.org/request/show/421317
OBS-URL: https://build.opensuse.org/package/show/Virtualization:containers/containerd?expand=0&rev=23
2016-08-23 15:13:07 +00:00
Jordi Massaguer
1cf260e571 Accepting request 419902 from home:chbrauner:branches:Virtualization:containers
OBS-URL: https://build.opensuse.org/request/show/419902
OBS-URL: https://build.opensuse.org/package/show/Virtualization:containers/containerd?expand=0&rev=21
2016-08-18 09:49:59 +00:00
Christian Brauner
8373197d4c Accepting request 419587 from home:cyphar:branches:Virtualization:containers
This pins the containerd component versions to ensure we don't create problems for ourselves. boo#993847

OBS-URL: https://build.opensuse.org/request/show/419587
OBS-URL: https://build.opensuse.org/package/show/Virtualization:containers/containerd?expand=0&rev=19
2016-08-16 10:57:22 +00:00
Christian Brauner
2ccfd491e7 Accepting request 412320 from home:cyphar:branches:Virtualization:containers
fixed the path to runc

OBS-URL: https://build.opensuse.org/request/show/412320
OBS-URL: https://build.opensuse.org/package/show/Virtualization:containers/containerd?expand=0&rev=17
2016-07-20 11:14:29 +00:00
Jordi Massaguer
9c97a693e5 update changelog with fate#
OBS-URL: https://build.opensuse.org/package/show/Virtualization:containers/containerd?expand=0&rev=16
2016-07-20 08:36:26 +00:00
Jordi Massaguer
84d4cf45b3 add bug number for docker 1.11.2
OBS-URL: https://build.opensuse.org/package/show/Virtualization:containers/containerd?expand=0&rev=15
2016-07-19 15:35:18 +00:00
Aleksa Sarai
7239233a76 * Update to containerd v0.2.2.
* Includes updates to the out-of-tree patches.

OBS-URL: https://build.opensuse.org/package/show/Virtualization:containers/containerd?expand=0&rev=13
2016-06-17 14:40:17 +00:00
Aleksa Sarai
30c47c9be9 * Remove MountFlags=slave from containerd.service. This causes many issues with
interactions with Docker.

OBS-URL: https://build.opensuse.org/package/show/Virtualization:containers/containerd?expand=0&rev=11
2016-05-02 07:35:31 +00:00
Aleksa Sarai
b2a9550fa4 * Added /usr/sbin/rccontainerd symlink as per suse-missing-rclink.
* Updated socket activation patches to use the same patchset that was merged
  upstream (https://github.com/docker/containerd/pull/178):
  * socket-activation-01-vendor.patch
  * socket-activation-02-daemon.patch
  * socket-activation-03-ctr.patch
* Removed aarch64 that was patched upstream:
  - fix-aarch64-epoll.patch
* Update containerd to 0.2.1. Upstream changelog:
  * Fixes for cgroup memory updates and process labeling.
  * Truncate the event log on disk and in memory so that it does not
    grow forever.  This is mainly used for higher levels to receive past
    events if they miss any.

OBS-URL: https://build.opensuse.org/package/show/Virtualization:containers/containerd?expand=0&rev=10
2016-04-29 10:06:39 +00:00
Aleksa Sarai
e97581ad3a * Use the gc compiler for aarch64 builds.
* Add a patch to fix the new aarch64 build support, which has not yet been
  merged upstream (https://github.com/docker/containerd/pull/195):
  + fix-aarch64-epoll.patch
* Rebase the socket activation patchset which has yet to be merged
  (https://github.com/docker/containerd/pull/178):
  * socket-activation-01-vendor.patch
  * socket-activation-02-daemon.patch
  * socket-activation-03-ctr.patch
* Update to containerd 0.2.0. Changelog:
  + Add Limit to PidsStats
  + Add timeout flag for container start times.
  + Add timeout option for GRPC connection.
  + Add no_pivot_root support.
  + Add runtimeArgs to pass to shim
  * Move epoll syscall to a separate package so we can build on aarch64.
  * Fix ctr termios restoration isssues.
  * Several bug fixes.
  - Remove dependencies on larger packages.

OBS-URL: https://build.opensuse.org/package/show/Virtualization:containers/containerd?expand=0&rev=9
2016-04-19 10:37:57 +00:00
Aleksa Sarai
9d6a90135c * Use --listen fd:// to *actually use* socket activation with systemd.
* Remove MountFlags=slave since it's not relevant to containerd and might cause
  issues in the future.

OBS-URL: https://build.opensuse.org/package/show/Virtualization:containers/containerd?expand=0&rev=8
2016-04-04 11:59:50 +00:00
Aleksa Sarai
4c920e636d * Use socket activation with the containerd-daemon. This requires a
not-yet-upstream patchset which has been condensed into the patch file
  + daemon-implement-socket-activation.patch
* Update to containerd 0.1.0. This required quite a few fixes.

OBS-URL: https://build.opensuse.org/package/show/Virtualization:containers/containerd?expand=0&rev=7
2016-04-01 12:49:25 +00:00
Aleksa Sarai
c5d67b894c * ctr -> containerd-ctr
OBS-URL: https://build.opensuse.org/package/show/Virtualization:containers/containerd?expand=0&rev=6
2016-03-30 14:29:23 +00:00
Aleksa Sarai
4d8178c2a1 * Install to /usr/sbin.
OBS-URL: https://build.opensuse.org/package/show/Virtualization:containers/containerd?expand=0&rev=5
2016-03-30 14:20:26 +00:00
Aleksa Sarai
678af8a5f2 * Add Requires: runc.
OBS-URL: https://build.opensuse.org/package/show/Virtualization:containers/containerd?expand=0&rev=3
2016-03-27 11:17:46 +00:00
Aleksa Sarai
c52edff9a3 * Add service and sysconfig files.
* Separately package the client from the server.

OBS-URL: https://build.opensuse.org/package/show/Virtualization:containers/containerd?expand=0&rev=2
2016-03-27 11:14:42 +00:00
Aleksa Sarai
79d52504c9 * Add initial packaging of containerd 0.0.5.
OBS-URL: https://build.opensuse.org/package/show/Virtualization:containers/containerd?expand=0&rev=1
2016-03-27 10:27:18 +00:00