diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker-runc/docker-runc-1.0.0_rc5_p22.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker-runc/docker-runc-1.0.0_rc5_p22.ebuild index 628326dbbf..72f5946ba7 100644 --- a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker-runc/docker-runc-1.0.0_rc5_p22.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker-runc/docker-runc-1.0.0_rc5_p22.ebuild @@ -7,14 +7,12 @@ GITHUB_URI="github.com/opencontainers/runc" COREOS_GO_PACKAGE="${GITHUB_URI}" COREOS_GO_VERSION="go1.10" # the commit of runc that docker uses. -# see https://github.com/docker/docker-ce/blob/v18.06.2-ce/components/engine/hack/dockerfile/install/runc.installer#L5 +# see https://github.com/docker/docker-ce/blob/v18.06.3-ce/components/engine/hack/dockerfile/install/runc.installer#L4 # Update the patch number when this commit is changed (i.e. the _p in the ebuild). # The patch version is arbitrarily the number of commits since the tag version # specified in the ebuild name. For example: # $ git log --oneline v1.0.0-rc5..${COMMIT_ID} | wc -l COMMIT_ID="a592beb5bc4c4092b1b1bac971afed27687340c5" -# This is the expected commit ID, which ignores the patch in the commit above. -RUNC_COMMIT="69663f0bd4b60df09991c08812a60108003fa340" inherit eutils flag-o-matic coreos-go vcs-snapshot @@ -63,7 +61,7 @@ src_compile() { GOPATH="${WORKDIR}/${P}" emake BUILDTAGS="${options[*]}" \ VERSION=1.0.0-rc5+dev.docker-18.06 \ - COMMIT="${RUNC_COMMIT}" + COMMIT="${COMMIT_ID}" } src_install() { diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/docker-runc-1.0.0_rc5_p22 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/docker-runc-1.0.0_rc5_p22 index cbd4321d76..5b1c9e9c26 100644 --- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/docker-runc-1.0.0_rc5_p22 +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/docker-runc-1.0.0_rc5_p22 @@ -12,4 +12,4 @@ RESTRICT=test SLOT=0 SRC_URI=https://github.com/opencontainers/runc/archive/a592beb5bc4c4092b1b1bac971afed27687340c5.tar.gz -> docker-runc-1.0.0_rc5_p22.tar.gz _eclasses_=coreos-go e0b9bd13413783cf7a2859afc20534a2 coreos-go-depend cec6567f1c69a9b3e529a49eedaeed55 coreos-go-utils 67004337b6f831adc5f1ff107ee2f157 desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 55aaa148741116aa54ad0d80e361818e ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multilib b2f01ad412baf81650c23fcf0975fa33 multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs f164325a2cdb5b3ea39311d483988861 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf vcs-snapshot b77011b62e2053c646ad720defe6d921 -_md5_=21335b1e8685fad299934cc6bcc55f93 +_md5_=c1cc0d32b018e3431bb1ec6fb4c4a5b3