mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2025-08-22 23:11:07 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2350 from crawford/docker

Browse Source 
app-emulation/docker: remove early docker
This commit is contained in:
Alex Crawford 2017-01-04 21:27:01 -08:00 committed by GitHub
commit a80954a87b
8 changed files with 2 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-1.12.5-r1.ebuild → sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-1.12.5-r2.ebuild vendored
View File

3
sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-9999.ebuild vendored
View File

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

4
sdk_container/src/third_party/coreos-overlay/app-emulation/docker/files/docker.service vendored
View File

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

15
sdk_container/src/third_party/coreos-overlay/app-emulation/docker/files/docker.service-1.7 vendored
View File

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

29
sdk_container/src/third_party/coreos-overlay/app-emulation/docker/files/early-docker.service vendored
View File

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

15
sdk_container/src/third_party/coreos-overlay/app-emulation/docker/files/early-docker.service-1.7 vendored
View File

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

9
sdk_container/src/third_party/coreos-overlay/app-emulation/docker/files/early-docker.socket vendored
View File

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

2
sdk_container/src/third_party/coreos-overlay/app-emulation/docker/files/early-docker.target vendored
View File

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