diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/Manifest b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/Manifest index 73f19c6389..f36613cb19 100644 --- a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/Manifest +++ b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/Manifest @@ -1,2 +1,2 @@ DIST docker-18.03.1.tar.gz 12758590 SHA256 b05f3709844c45d49922914cf6eb71d4131d0bd5389361376ff6a86aa186f4a0 SHA512 48c4916421cd500ada1bfc2207123a29870939a15a1c7c4a0c082f61c1e3e063381e2345ee9df645dbaca49e002dbfaba70cf6fe233b39a4e1f44fb015807e10 WHIRLPOOL a3bab244645243db9c4072be3f81d22298ddf0b4b2d260bc57a7244981fe67acd4cd308e82a2bc5e2afde7b90351aac41fba4808a5b64d0eec6dc03113aed8f2 -DIST docker-18.05.0.tar.gz 12822443 SHA256 cc29408b382774b9f5967ee33851e97bcb7463aa7358d60004f28b836a70ba75 SHA512 81997f32a45bf9cf7e79c936728999dac84e6c51e7ec04c7dd4f0fc1fbc837aaddd2ce4fa5e4e3eb2ee99599b005f06104b81b0fa858e59692c17398a341bfd1 WHIRLPOOL 8bceefeb401308b22a92ef2652f2ace4e3b218ea421c7b9966fe85327e4f9a862f20bb8e2accc7bcbf591f350f82e8ba0dd70df5aabe70327bb5dcacf6660176 +DIST docker-18.06.0.tar.gz 13656557 SHA256 18754ecb38d7c210fb2b96ee618dc2bdf94e66cd501d4eef0c685903a83e8501 SHA512 d5bd6a83126c4dba14c775533b6c9bda35af2cd97db13922b3766494ce10dd9316d0167c87a6683dede28ea063f9435a0a009b96e413dad8abc7884a3468d589 WHIRLPOOL 708a9ce17f440c4d2161a89b92591c82653b8d61eb7e1d72d47b389f674d92c826bf5f86daa3f770450479e8768fc8f451ee6cbc0f5ffd8585be527f8f2a0005 diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-18.05.0-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-18.06.0.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-18.05.0-r1.ebuild rename to sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-18.06.0.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-9999.ebuild index 4f69a01f0a..5d7978f66b 100644 --- a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-9999.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-9999.ebuild @@ -19,7 +19,7 @@ else else MY_PV="$PV-ce" fi - DOCKER_GITCOMMIT="f150324" + DOCKER_GITCOMMIT="0ffa825" SRC_URI="https://${COREOS_GO_PACKAGE}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz" KEYWORDS="amd64 arm64" [ "$DOCKER_GITCOMMIT" ] || die "DOCKER_GITCOMMIT must be added manually for each bump!" @@ -59,14 +59,16 @@ DEPEND+="sys-kernel/coreos-kernel" # https://github.com/docker/docker/blob/master/project/PACKAGERS.md#optional-dependencies RDEPEND=" ${CDEPEND} + + !app-emulation/docker-bin >=net-firewall/iptables-1.4 sys-process/procps >=dev-vcs/git-1.7 >=app-arch/xz-utils-4.9 dev-libs/libltdl - =app-emulation/containerd-1.0.3 - =app-emulation/docker-runc-1.0.0_rc5[apparmor?,seccomp?] - =app-emulation/docker-proxy-0.8.0_p20180411 + =app-emulation/containerd-1.1.1 + =app-emulation/docker-runc-1.0.0_rc5_p19[apparmor?,seccomp?] + =app-emulation/docker-proxy-0.8.0_p20180709 container-init? ( >=sys-process/tini-0.13.1 ) " @@ -74,9 +76,7 @@ RESTRICT="installsources strip" S="${WORKDIR}/${P}/src/${COREOS_GO_PACKAGE}" -ENGINE_PATCHES=( - "${FILESDIR}/fix-bind-mount-bug2440.patch" -) +ENGINE_PATCHES=() # see "contrib/check-config.sh" from upstream's sources CONFIG_CHECK=" @@ -265,7 +265,7 @@ src_compile() { pushd components/cli || die - # Imitating https://github.com/docker/docker-ce/blob/v18.05.0-ce/components/cli/scripts/build/.variables#L7 + # Imitating https://github.com/docker/docker-ce/blob/v18.06.0-ce/components/cli/scripts/build/.variables#L7 CLI_BUILDTIME="$(date -d "@${DOCKER_BUILD_DATE}" --utc --rfc-3339 ns 2> /dev/null | sed -e 's/ /T/')" # build cli emake \ diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/files/fix-bind-mount-bug2440.patch b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/files/fix-bind-mount-bug2440.patch deleted file mode 100644 index 84827600e2..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/files/fix-bind-mount-bug2440.patch +++ /dev/null @@ -1,66 +0,0 @@ -From d8fd6137a1f6d95a2bcdfeb6e1dfa6b816790c5e Mon Sep 17 00:00:00 2001 -From: Kir Kolyshkin -Date: Thu, 10 May 2018 12:01:50 -0700 -Subject: [PATCH] daemon.getSourceMount(): fix for / mount point - -A recent optimization in getSourceMount() made it return an error -in case when the found mount point is "/". This prevented bind-mounted -volumes from working in such cases. - -A (rather trivial but adeqate) unit test case is added. - -Fixes: 871c957242 ("getSourceMount(): simplify") -Signed-off-by: Kir Kolyshkin ---- - daemon/oci_linux.go | 8 +------- - daemon/oci_linux_test.go | 14 ++++++++++++++ - 2 files changed, 15 insertions(+), 7 deletions(-) - -diff --git a/daemon/oci_linux.go b/daemon/oci_linux.go -index 62e7c7f1d682..766701a41683 100644 ---- a/daemon/oci_linux.go -+++ b/daemon/oci_linux.go -@@ -405,13 +405,7 @@ func getSourceMount(source string) (string, string, error) { - idx = i - } - } -- // and return it unless it's "/" -- if mi[idx].Mountpoint != "/" { -- return mi[idx].Mountpoint, mi[idx].Optional, nil -- } -- -- // If we are here, we did not find parent mount. Something is wrong. -- return "", "", fmt.Errorf("Could not find source mount of %s", source) -+ return mi[idx].Mountpoint, mi[idx].Optional, nil - } - - const ( -diff --git a/daemon/oci_linux_test.go b/daemon/oci_linux_test.go -index 5f2731b8d652..e28fac004efd 100644 ---- a/daemon/oci_linux_test.go -+++ b/daemon/oci_linux_test.go -@@ -1,6 +1,7 @@ - package daemon // import "github.com/docker/docker/daemon" - - import ( -+ "os" - "testing" - - containertypes "github.com/docker/docker/api/types/container" -@@ -86,3 +87,16 @@ func TestIpcPrivateVsReadonly(t *testing.T) { - assert.Check(t, is.Equal(false, inSlice(m.Options, "ro"))) - } - } -+ -+func TestGetSourceMount(t *testing.T) { -+ // must be able to find source mount for / -+ mnt, _, err := getSourceMount("/") -+ assert.NilError(t, err) -+ assert.Equal(t, mnt, "/") -+ -+ // must be able to find source mount for current directory -+ cwd, err := os.Getwd() -+ assert.NilError(t, err) -+ _, _, err = getSourceMount(cwd) -+ assert.NilError(t, err) -+}