From e10db47282489852a922db03b450014491394cb0ad151dd0401fb1ad7fb60c97 Mon Sep 17 00:00:00 2001 From: Aleksa Sarai Date: Mon, 19 Dec 2016 08:39:07 +0000 Subject: [PATCH 1/5] Accepting request 446750 from home:jordimassaguerpla:branch:Vc:runc_symlink_docker_runc - add the /usr/bin/docker-run symlink to partially fix bsc#1015661 OBS-URL: https://build.opensuse.org/request/show/446750 OBS-URL: https://build.opensuse.org/package/show/Virtualization:containers/runc?expand=0&rev=30 --- runc.changes | 5 +++++ runc.spec | 3 +++ 2 files changed, 8 insertions(+) diff --git a/runc.changes b/runc.changes index fcf5864..8f76b73 100644 --- a/runc.changes +++ b/runc.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Dec 16 17:05:37 UTC 2016 - jmassaguerpla@suse.com + +- add the /usr/bin/docker-run symlink to partially fix bsc#1015661 + ------------------------------------------------------------------- Thu Nov 24 11:05:41 UTC 2016 - jmassaguerpla@suse.com diff --git a/runc.spec b/runc.spec index 22ef79a..efef1c5 100644 --- a/runc.spec +++ b/runc.spec @@ -146,6 +146,8 @@ go test -timeout 3m -tags "$BUILDTAGS" -v $PKG_LIST %{__install} -D -m755 %{name}-%{version} %{buildroot}%{_sbindir}/%{name} install -d -m755 %{buildroot}/usr/src/runc/ cp -avr $HOME/go/src/github.com/opencontainers/runc/* %{buildroot}/usr/src/runc/ +install -d -m755 %{buildroot}/%{_bindir} +ln -s /usr/sbin/runc %{buildroot}/%{_bindir}/docker-runc %ifarch %go_arches %{__install} -d -m755 %{buildroot}%{_mandir}/man8 @@ -158,6 +160,7 @@ cp -avr $HOME/go/src/github.com/opencontainers/runc/* %{buildroot}/usr/src/runc/ %defattr(-,root,root) %doc README.md LICENSE %{_sbindir}/%{name} +%{_bindir}/docker-runc %ifarch %go_arches %{_mandir}/man8/runc*.8.gz From 4c6313f08e5178e94386de2c9875f7553bc4b634dea913baeab9d780a773879b Mon Sep 17 00:00:00 2001 From: Aleksa Sarai Date: Mon, 19 Dec 2016 14:01:37 +0000 Subject: [PATCH 2/5] OBS-URL: https://build.opensuse.org/package/show/Virtualization:containers/runc?expand=0&rev=31 --- _service | 8 ++++++-- runc-git.02f8fa7.tar.xz | 3 --- runc-git.f59ba3cdd76f.tar.xz | 3 +++ runc.changes | 22 ++++++++++++++++++---- runc.spec | 10 ++++++---- 5 files changed, 33 insertions(+), 13 deletions(-) delete mode 100644 runc-git.02f8fa7.tar.xz create mode 100644 runc-git.f59ba3cdd76f.tar.xz diff --git a/_service b/_service index 02a8aac..08404c0 100644 --- a/_service +++ b/_service @@ -1,10 +1,14 @@ - https://github.com/opencontainers/runc.git + + https://github.com/docker/runc.git git runc git.%h - 02f8fa7863dd3f82909a73e2061897828460d52f + f59ba3cdd76fdc08c004f42aa915996f6f420899 .git diff --git a/runc-git.02f8fa7.tar.xz b/runc-git.02f8fa7.tar.xz deleted file mode 100644 index cf036af..0000000 --- a/runc-git.02f8fa7.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:243c748d094c46a8d6ca283f9992d69be161bf5bd32716b0e20664caac456427 -size 405940 diff --git a/runc-git.f59ba3cdd76f.tar.xz b/runc-git.f59ba3cdd76f.tar.xz new file mode 100644 index 0000000..53976c3 --- /dev/null +++ b/runc-git.f59ba3cdd76f.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a82fddecb61fbef51d9dc1de2db9688c0936ea48ad7f023c65d8341aea8d2421 +size 406472 diff --git a/runc.changes b/runc.changes index 8f76b73..1ad7f3c 100644 --- a/runc.changes +++ b/runc.changes @@ -1,7 +1,21 @@ +------------------------------------------------------------------- +Mon Dec 19 12:49:38 UTC 2016 - jmassaguerpla@suse.com + +- update runc to the version used in docker 1.12.5 (bsc#1016307). + This fixes bsc#1015661 + +------------------------------------------------------------------- +Mon Dec 19 12:17:07 UTC 2016 - asarai@suse.com + +- For the moment, we have to switch to using Docker's fork of runC. This *will* + be solved properly by creating a new package purely for Docker's runC fork, + because it's quite silly to tie OCI project releases to Docker's vendoring + scheme. Once this is fixed, this package will be switch to being purely-OCI. + ------------------------------------------------------------------- Fri Dec 16 17:05:37 UTC 2016 - jmassaguerpla@suse.com -- add the /usr/bin/docker-run symlink to partially fix bsc#1015661 +- add the /usr/bin/docker-run symlink to partially fix bsc#1015661 ------------------------------------------------------------------- Thu Nov 24 11:05:41 UTC 2016 - jmassaguerpla@suse.com @@ -9,12 +23,12 @@ Thu Nov 24 11:05:41 UTC 2016 - jmassaguerpla@suse.com - fix version by adding a revision "counter" so that it will always increase - fix bsc#1009961 + fix bsc#1009961 ------------------------------------------------------------------- Thu Oct 13 11:04:27 UTC 2016 - jmassaguerpla@suse.com -- update to 02f8fa7 because that is the needed version for docker 1.12.1 (bsc#1004490) +- update to 02f8fa7 because that is the needed version for docker 1.12.1 (bsc#1004490) ------------------------------------------------------------------- Wed Sep 21 05:13:26 UTC 2016 - jengelh@inai.de @@ -25,7 +39,7 @@ Wed Sep 21 05:13:26 UTC 2016 - jengelh@inai.de Mon Sep 19 11:57:45 UTC 2016 - jmassaguerpla@suse.com - fix go_arches definition: use global instead of define, otherwise - it fails to build + it fails to build ------------------------------------------------------------------- Fri Aug 26 08:59:54 UTC 2016 - asarai@suse.com diff --git a/runc.spec b/runc.spec index efef1c5..58746ee 100644 --- a/runc.spec +++ b/runc.spec @@ -37,17 +37,20 @@ %endif # MANUAL: Update the git_version and git_revision -%define git_version 02f8fa7 +# FIX-OPENSUSE: This will be removed as soon as we move Docker's runC fork into +# a separate package. This whole versioning mess is caused by +# Docker vendoring non-releases of runC. +%define git_version f59ba3cdd76f # How to get the git_revision # git clone ${url}.git runc-upstream # cd runc-upstream # git checkout $git_version # git_revision=r$(git rev-list HEAD | wc -l) -%define git_revision r2816 +%define git_revision r2818 %define version_unconverted %{git_version} Name: runc -Version: 0.1.1+git%{git_revision}_%{git_version} +Version: 0.1.1+git%{git_revision}_%{git_version}+%{git_patches} Release: 0 Summary: Tool for spawning and running OCI containers License: Apache-2.0 @@ -99,7 +102,6 @@ Test package for runc. It contains the source code and the tests. %prep %setup -q -n %{name}-git.%{git_version} -# Apply the vendor'd patch to the right subdirectory. %build # Do not use symlinks. If you want to run the unit tests for this package at From 118b9cd3a0b6ec955dae21907aa1db47e6c4456bf7d8bd176fc031538406f8d9 Mon Sep 17 00:00:00 2001 From: Jordi Massaguer Date: Mon, 19 Dec 2016 17:41:49 +0000 Subject: [PATCH 3/5] fix version OBS-URL: https://build.opensuse.org/package/show/Virtualization:containers/runc?expand=0&rev=32 --- runc.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/runc.spec b/runc.spec index 58746ee..4578717 100644 --- a/runc.spec +++ b/runc.spec @@ -50,7 +50,7 @@ %define version_unconverted %{git_version} Name: runc -Version: 0.1.1+git%{git_revision}_%{git_version}+%{git_patches} +Version: 0.1.1+git%{git_revision}_%{git_version} Release: 0 Summary: Tool for spawning and running OCI containers License: Apache-2.0 From eb1aad3421e85f0f673c128f66e79c4d87f1442920cf3a2d74871e5d0bdce122 Mon Sep 17 00:00:00 2001 From: Aleksa Sarai Date: Wed, 21 Dec 2016 16:38:17 +0000 Subject: [PATCH 4/5] Accepting request 447318 from home:jordimassaguerpla:branch:V:c:fix_runc_symlink - add symlink to docker-runc in the post section, as this is how it has been already fixed for some client. fixes bsc#1015661 OBS-URL: https://build.opensuse.org/request/show/447318 OBS-URL: https://build.opensuse.org/package/show/Virtualization:containers/runc?expand=0&rev=33 --- runc.changes | 6 ++++++ runc.spec | 10 +++++++--- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/runc.changes b/runc.changes index 1ad7f3c..ab7296e 100644 --- a/runc.changes +++ b/runc.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Dec 21 09:43:06 UTC 2016 - jmassaguerpla@suse.com + +- add symlink to docker-runc in the post section, as this is how it + has been already fixed for some client. fixes bsc#1015661 + ------------------------------------------------------------------- Mon Dec 19 12:49:38 UTC 2016 - jmassaguerpla@suse.com diff --git a/runc.spec b/runc.spec index 4578717..956ee75 100644 --- a/runc.spec +++ b/runc.spec @@ -148,8 +148,6 @@ go test -timeout 3m -tags "$BUILDTAGS" -v $PKG_LIST %{__install} -D -m755 %{name}-%{version} %{buildroot}%{_sbindir}/%{name} install -d -m755 %{buildroot}/usr/src/runc/ cp -avr $HOME/go/src/github.com/opencontainers/runc/* %{buildroot}/usr/src/runc/ -install -d -m755 %{buildroot}/%{_bindir} -ln -s /usr/sbin/runc %{buildroot}/%{_bindir}/docker-runc %ifarch %go_arches %{__install} -d -m755 %{buildroot}%{_mandir}/man8 @@ -158,11 +156,17 @@ ln -s /usr/sbin/runc %{buildroot}/%{_bindir}/docker-runc %fdupes %{buildroot}/%{_prefix} +%post +echo "Running Post Install Script" +if [ ! -e "/usr/bin/docker-runc" ] +then + ln -s /usr/sbin/runc /usr/bin/docker-runc +fi + %files %defattr(-,root,root) %doc README.md LICENSE %{_sbindir}/%{name} -%{_bindir}/docker-runc %ifarch %go_arches %{_mandir}/man8/runc*.8.gz From 24bfdba7437df6e0085fb7d090f6a9729ab98f034e3637cb40a0dc7207d48157 Mon Sep 17 00:00:00 2001 From: Aleksa Sarai Date: Wed, 28 Dec 2016 10:08:10 +0000 Subject: [PATCH 5/5] Accepting request 447963 from home:jordimassaguerpla:branch:Vc:fix_runc_symlink OBS-URL: https://build.opensuse.org/request/show/447963 OBS-URL: https://build.opensuse.org/package/show/Virtualization:containers/runc?expand=0&rev=34 --- runc.changes | 6 ------ runc.spec | 10 +++++----- 2 files changed, 5 insertions(+), 11 deletions(-) diff --git a/runc.changes b/runc.changes index ab7296e..1ad7f3c 100644 --- a/runc.changes +++ b/runc.changes @@ -1,9 +1,3 @@ -------------------------------------------------------------------- -Wed Dec 21 09:43:06 UTC 2016 - jmassaguerpla@suse.com - -- add symlink to docker-runc in the post section, as this is how it - has been already fixed for some client. fixes bsc#1015661 - ------------------------------------------------------------------- Mon Dec 19 12:49:38 UTC 2016 - jmassaguerpla@suse.com diff --git a/runc.spec b/runc.spec index 956ee75..5022aff 100644 --- a/runc.spec +++ b/runc.spec @@ -149,6 +149,10 @@ go test -timeout 3m -tags "$BUILDTAGS" -v $PKG_LIST install -d -m755 %{buildroot}/usr/src/runc/ cp -avr $HOME/go/src/github.com/opencontainers/runc/* %{buildroot}/usr/src/runc/ +# symlink runc as docker-runc. bsc#1015661 +install -d -m755 %{buildroot}/%{_bindir} +ln -s /usr/sbin/runc %{buildroot}/%{_bindir}/docker-runc + %ifarch %go_arches %{__install} -d -m755 %{buildroot}%{_mandir}/man8 %{__install} -m644 man/man8/runc*.8 %{buildroot}%{_mandir}/man8 @@ -157,16 +161,12 @@ cp -avr $HOME/go/src/github.com/opencontainers/runc/* %{buildroot}/usr/src/runc/ %fdupes %{buildroot}/%{_prefix} %post -echo "Running Post Install Script" -if [ ! -e "/usr/bin/docker-runc" ] -then - ln -s /usr/sbin/runc /usr/bin/docker-runc -fi %files %defattr(-,root,root) %doc README.md LICENSE %{_sbindir}/%{name} +%{_bindir}/docker-runc %ifarch %go_arches %{_mandir}/man8/runc*.8.gz