From da4253ab4ce2bde2af201d729068232b9f624795 Mon Sep 17 00:00:00 2001 From: Brandon Philips Date: Fri, 16 May 2014 13:56:52 -0700 Subject: [PATCH 1/2] chore(app-emulation/docker): remove symlink-usr case We are never shipping another -generic image so just make symlink-usr the only .service file. --- .../app-emulation/docker/docker-9999.ebuild | 6 +----- .../app-emulation/docker/files/docker.service | 2 +- .../docker/files/symlink-usr/docker.service | 12 ------------ 3 files changed, 2 insertions(+), 18 deletions(-) delete mode 100644 sdk_container/src/third_party/coreos-overlay/app-emulation/docker/files/symlink-usr/docker.service 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 6730c62093..2d17b91ed8 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 @@ -166,11 +166,7 @@ src_install() { newinitd contrib/init/openrc/docker.initd docker newconfd contrib/init/openrc/docker.confd docker - if use symlink-usr; then - systemd_dounit "${FILESDIR}/symlink-usr/docker.service" - else - systemd_dounit "${FILESDIR}/docker.service" - fi + systemd_dounit "${FILESDIR}/docker.service" systemd_dounit "${FILESDIR}/docker.socket" insinto /usr/lib/systemd/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 fc02ea45a3..573273272b 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 @@ -6,7 +6,7 @@ Documentation=http://docs.docker.io ExecStartPre=/bin/mount --make-rprivate / # Run docker but don't have docker automatically restart # containers. This is a job for systemd and unit files. -ExecStart=/usr/bin/docker -d -r=false -H fd:// +ExecStart=/usr/bin/docker -d -s=btrfs -r=false -H fd:// [Install] WantedBy=multi-user.target diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/files/symlink-usr/docker.service b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/files/symlink-usr/docker.service deleted file mode 100644 index 573273272b..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/files/symlink-usr/docker.service +++ /dev/null @@ -1,12 +0,0 @@ -[Unit] -Description=Docker Application Container Engine -Documentation=http://docs.docker.io - -[Service] -ExecStartPre=/bin/mount --make-rprivate / -# Run docker but don't have docker automatically restart -# containers. This is a job for systemd and unit files. -ExecStart=/usr/bin/docker -d -s=btrfs -r=false -H fd:// - -[Install] -WantedBy=multi-user.target From 50b1922a519467215e6d703a0b4fef43fa895f2f Mon Sep 17 00:00:00 2001 From: Brandon Philips Date: Thu, 15 May 2014 18:58:43 -0700 Subject: [PATCH 2/2] fix(app-emulation/docker): add TMPDIR=/var/tmp This fixes the issue reported here where /tmp runs out os space during a docker save https://github.com/coreos/coreos-vagrant/issues/49#issuecomment-43287780 --- .../docker/{docker-0.11.1.ebuild => docker-0.11.1-r1.ebuild} | 0 .../coreos-overlay/app-emulation/docker/files/docker.service | 1 + 2 files changed, 1 insertion(+) rename sdk_container/src/third_party/coreos-overlay/app-emulation/docker/{docker-0.11.1.ebuild => docker-0.11.1-r1.ebuild} (100%) diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-0.11.1.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-0.11.1-r1.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-0.11.1.ebuild rename to sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-0.11.1-r1.ebuild 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 573273272b..174ccb9b54 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 @@ -3,6 +3,7 @@ Description=Docker Application Container Engine Documentation=http://docs.docker.io [Service] +Environment="TMPDIR=/var/tmp/" ExecStartPre=/bin/mount --make-rprivate / # Run docker but don't have docker automatically restart # containers. This is a job for systemd and unit files.