Merge pull request #2350 from crawford/docker

app-emulation/docker: remove early docker

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

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

sdk_container/src/third_party/coreos-overlay/app-emulation/docker/files/docker.service-1.7

@@ -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

sdk_container/src/third_party/coreos-overlay/app-emulation/docker/files/early-docker.service

@@ -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

sdk_container/src/third_party/coreos-overlay/app-emulation/docker/files/early-docker.service-1.7

@@ -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

sdk_container/src/third_party/coreos-overlay/app-emulation/docker/files/early-docker.socket

@@ -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

sdk_container/src/third_party/coreos-overlay/app-emulation/docker/files/early-docker.target

@@ -1,2 +0,0 @@
-[Unit]
-Description=Run Docker containers before main Docker starts up