From b8dc3c5213b3645448d6baeb7bfaa2f72cc440ce Mon Sep 17 00:00:00 2001 From: Alex Crawford Date: Tue, 4 Oct 2016 13:12:51 -0700 Subject: [PATCH] app-emulation/docker: revert to 1.11.2 --- ...12.1-r3.ebuild => docker-1.11.2-r4.ebuild} | 0 .../app-emulation/docker/docker-9999.ebuild | 20 ++++++------------- .../app-emulation/docker/files/docker.service | 7 +------ .../app-emulation/docker/files/dockerd | 2 +- .../docker/files/early-docker.service | 7 +------ 5 files changed, 9 insertions(+), 27 deletions(-) rename sdk_container/src/third_party/coreos-overlay/app-emulation/docker/{docker-1.12.1-r3.ebuild => docker-1.11.2-r4.ebuild} (100%) diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-1.12.1-r3.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-1.11.2-r4.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-1.12.1-r3.ebuild rename to sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-1.11.2-r4.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 b31a458b58..e9851becdd 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 @@ -13,7 +13,7 @@ if [[ ${PV} == *9999 ]]; then DOCKER_GITCOMMIT="unknown" KEYWORDS="~amd64 ~arm64" else - CROS_WORKON_COMMIT="7a86f89a77eb849ed9e4ccb784dec402df224e3e" # coreos-1.12.1 + CROS_WORKON_COMMIT="569214bb43beb1a094beeacfbe6b1cf7df2ab0cf" # coreos-1.11.2 DOCKER_GITCOMMIT="${CROS_WORKON_COMMIT:0:7}" KEYWORDS="amd64 arm64" fi @@ -65,8 +65,8 @@ RDEPEND=" >=dev-vcs/git-1.7 >=app-arch/xz-utils-4.9 - >=app-emulation/containerd-0.2.3[seccomp?] - >=app-emulation/runc-1.0.0_rc1_p20160615[apparmor?,seccomp?] + >=app-emulation/containerd-0.2.0 + >=app-emulation/runc-0.1.0 " RESTRICT="installsources strip" @@ -217,11 +217,8 @@ src_compile() { grep -q -- '-fno-PIC' hack/make.sh || die 'hardened sed failed' sed "s/LDFLAGS_STATIC_DOCKER='/&-extldflags -fno-PIC /" \ - -i hack/make/dynbinary-client || die - sed "s/LDFLAGS_STATIC_DOCKER='/&-extldflags -fno-PIC /" \ - -i hack/make/dynbinary-daemon || die - grep -q -- '-fno-PIC' hack/make/dynbinary-daemon || die 'hardened sed failed' - grep -q -- '-fno-PIC' hack/make/dynbinary-client || die 'hardened sed failed' + -i hack/make/dynbinary || die + grep -q -- '-fno-PIC' hack/make/dynbinary || die 'hardened sed failed' fi # let's set up some optional features :) @@ -263,12 +260,7 @@ src_compile() { src_install() { VERSION="$(cat VERSION)" - newbin "bundles/$VERSION/dynbinary-client/docker-$VERSION" docker - newbin "bundles/$VERSION/dynbinary-daemon/dockerd-$VERSION" dockerd - newbin "bundles/$VERSION/dynbinary-daemon/docker-proxy-$VERSION" docker-proxy - dosym containerd /usr/bin/docker-containerd - dosym containerd-shim /usr/bin/docker-containerd-shim - dosym runc /usr/bin/docker-runc + newbin "bundles/$VERSION/dynbinary/docker-$VERSION" docker newinitd contrib/init/openrc/docker.initd docker newconfd contrib/init/openrc/docker.confd docker diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/files/docker.service b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/files/docker.service index 3b283f1205..2a0510617f 100644 --- a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/files/docker.service +++ b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/files/docker.service @@ -5,14 +5,9 @@ After=docker.socket early-docker.target network.target Requires=docker.socket early-docker.target [Service] -Type=notify EnvironmentFile=-/run/flannel_docker_opts.env MountFlags=slave -# the default is not to use systemd for cgroups because the delegate issues still -# exists and systemd currently does not support the cgroup feature set required -# for containers run by docker -ExecStart=/usr/lib/coreos/dockerd --host=fd:// $DOCKER_OPTS $DOCKER_CGROUPS $DOCKER_OPT_BIP $DOCKER_OPT_MTU $DOCKER_OPT_IPMASQ -ExecReload=/bin/kill -s HUP $MAINPID +ExecStart=/usr/lib/coreos/dockerd daemon --host=fd:// $DOCKER_OPTS $DOCKER_CGROUPS $DOCKER_OPT_BIP $DOCKER_OPT_MTU $DOCKER_OPT_IPMASQ LimitNOFILE=1048576 # Having non-zero Limit*s causes performance problems due to accounting overhead # in the kernel. We recommend using cgroups to do container-local accounting. diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/files/dockerd b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/files/dockerd index 9260e127d8..4b4f58767f 100644 --- a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/files/dockerd +++ b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/files/dockerd @@ -87,4 +87,4 @@ if [[ -z "${ARG_SELINUX}" ]]; then maybe_enable_selinux fi -exec dockerd "$@" ${USE_SELINUX} +exec docker "$@" ${USE_SELINUX} diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/files/early-docker.service b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/files/early-docker.service index 3ff77d4eeb..bdb605c416 100644 --- a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/files/early-docker.service +++ b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/files/early-docker.service @@ -5,14 +5,9 @@ After=early-docker.socket Requires=early-docker.socket [Service] -Type=notify Environment=TMPDIR=/var/tmp MountFlags=slave -# the default is not to use systemd for cgroups because the delegate issues still -# exists and systemd currently does not support the cgroup feature set required -# for containers run by docker -ExecStart=/usr/lib/coreos/dockerd --host=fd:// --bridge=none --iptables=false --ip-masq=false --exec-root=/var/run/early-docker --graph=/var/lib/early-docker --pidfile=/var/run/early-docker.pid $DOCKER_OPTS $DOCKER_CGROUPS -ExecReload=/bin/kill -s HUP $MAINPID +ExecStart=/usr/lib/coreos/dockerd daemon --host=fd:// --bridge=none --iptables=false --ip-masq=false --exec-root=/var/run/early-docker --graph=/var/lib/early-docker --pidfile=/var/run/early-docker.pid $DOCKER_OPTS $DOCKER_CGROUPS LimitNOFILE=1048576 # Having non-zero Limit*s causes performance problems due to accounting overhead # in the kernel. We recommend using cgroups to do container-local accounting.