diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-1.12.5-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-1.12.5-r2.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-1.12.5-r1.ebuild rename to sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-1.12.5-r2.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 fea9892ac1..2ed9b97d7f 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 @@ -282,9 +282,6 @@ src_install() { systemd_dounit "${FILESDIR}/docker.service" systemd_dounit "${FILESDIR}/docker.socket" - systemd_dounit "${FILESDIR}/early-docker.service" - systemd_dounit "${FILESDIR}/early-docker.socket" - systemd_dounit "${FILESDIR}/early-docker.target" insinto /usr/lib/systemd/network doins "${FILESDIR}"/50-docker.network 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 a68a1dfaff..adc12da849 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 @@ -1,8 +1,8 @@ [Unit] Description=Docker Application Container Engine Documentation=http://docs.docker.com -After=containerd.service docker.socket early-docker.target network.target -Requires=containerd.service docker.socket early-docker.target +After=containerd.service docker.socket network.target +Requires=containerd.service docker.socket [Service] Type=notify diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/files/docker.service-1.7 b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/files/docker.service-1.7 deleted file mode 100644 index dd34cda8d5..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/files/docker.service-1.7 +++ /dev/null @@ -1,15 +0,0 @@ -[Unit] -Description=Docker Application Container Engine -Documentation=http://docs.docker.com -After=docker.socket early-docker.target network.target -Requires=docker.socket early-docker.target - -[Service] -EnvironmentFile=-/run/flannel_docker_opts.env -MountFlags=slave -LimitNOFILE=1048576 -LimitNPROC=1048576 -ExecStart=/usr/lib/coreos/dockerd --daemon --host=fd:// $DOCKER_OPTS $DOCKER_OPT_BIP $DOCKER_OPT_MTU $DOCKER_OPT_IPMASQ - -[Install] -WantedBy=multi-user.target 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 deleted file mode 100644 index 69d9fe5a80..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/files/early-docker.service +++ /dev/null @@ -1,29 +0,0 @@ -[Unit] -Description=Early Docker Application Container Engine -Documentation=http://docs.docker.com -After=containerd.service early-docker.socket -Requires=containerd.service early-docker.socket - -[Service] -Type=notify -Environment=TMPDIR=/var/tmp - -# 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 --containerd=/var/run/docker/libcontainerd/docker-containerd.sock $DOCKER_OPTS $DOCKER_CGROUPS -ExecReload=/bin/kill -s HUP $MAINPID -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. -LimitNPROC=infinity -LimitCORE=infinity -# Uncomment TasksMax if your systemd version supports it. -# Only systemd 226 and above support this version. -TasksMax=infinity -TimeoutStartSec=0 -# set delegate yes so that systemd does not reset the cgroups of docker containers -Delegate=yes - -[Install] -WantedBy=early-docker.target diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/files/early-docker.service-1.7 b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/files/early-docker.service-1.7 deleted file mode 100644 index 1c11c7b3cd..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/files/early-docker.service-1.7 +++ /dev/null @@ -1,15 +0,0 @@ -[Unit] -Description=Early Docker Application Container Engine -Documentation=http://docs.docker.com -After=early-docker.socket -Requires=early-docker.socket - -[Service] -Environment=TMPDIR=/var/tmp -MountFlags=slave -LimitNOFILE=1048576 -LimitNPROC=1048576 -ExecStart=/usr/lib/coreos/dockerd --daemon --host=fd:// --bridge=none --iptables=false --ip-masq=false --graph=/var/lib/early-docker --pidfile=/var/run/early-docker.pid - -[Install] -WantedBy=early-docker.target diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/files/early-docker.socket b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/files/early-docker.socket deleted file mode 100644 index 648b3ed417..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/files/early-docker.socket +++ /dev/null @@ -1,9 +0,0 @@ -[Unit] -Description=Early Docker Socket for the API -PartOf=early-docker.service - -[Socket] -ListenStream=/var/run/early-docker.sock - -[Install] -WantedBy=sockets.target diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/files/early-docker.target b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/files/early-docker.target deleted file mode 100644 index 6872bf33b2..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/files/early-docker.target +++ /dev/null @@ -1,2 +0,0 @@ -[Unit] -Description=Run Docker containers before main Docker starts up