mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2025-10-08 05:51:31 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #608 from philips/set-docker-tmpdir

Browse Source 
fix(app-emulation/docker): add TMPDIR=/var/tmp
This commit is contained in:
Brandon Philips 2014-05-16 16:05:42 -07:00
commit aa908b844e
4 changed files with 3 additions and 18 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-0.11.1.ebuild → sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-0.11.1-r1.ebuild vendored
View File

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

@ -166,11 +166,7 @@ src_install() {
newinitd contrib/init/openrc/docker.initd docker newinitd contrib/init/openrc/docker.initd docker
newconfd contrib/init/openrc/docker.confd 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" systemd_dounit "${FILESDIR}/docker.service"
fi
systemd_dounit "${FILESDIR}/docker.socket" systemd_dounit "${FILESDIR}/docker.socket"
insinto /usr/lib/systemd/network insinto /usr/lib/systemd/network

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

@ -3,10 +3,11 @@ Description=Docker Application Container Engine
Documentation=http://docs.docker.io Documentation=http://docs.docker.io
[Service] [Service]
Environment="TMPDIR=/var/tmp/"
ExecStartPre=/bin/mount --make-rprivate / ExecStartPre=/bin/mount --make-rprivate /
# Run docker but don't have docker automatically restart # Run docker but don't have docker automatically restart
# containers. This is a job for systemd and unit files. # 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] [Install]
WantedBy=multi-user.target WantedBy=multi-user.target

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

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