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

Merge pull request #695 from philips/bump-docker-fileno

Browse Source 
docker: bump to 1.0.1 and increase LimitNOFILE
This commit is contained in:
Brandon Philips 2014-06-23 17:33:21 -07:00
commit 6e3ba222d1
3 changed files with 4 additions and 2 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.0.0.ebuild → sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-1.0.1.ebuild vendored
View File

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

@ -17,8 +17,8 @@ if [[ ${PV} == *9999 ]]; then
DOCKER_GITCOMMIT="deadbee" DOCKER_GITCOMMIT="deadbee"
KEYWORDS="~amd64" KEYWORDS="~amd64"
else else
CROS_WORKON_COMMIT="63fe64c471e7d76be96a625350468dfc65c06c31" # v1.0.0 CROS_WORKON_COMMIT="990021ac2b4a4c8e6ae66dd331c372f70eec3b7a" # v1.0.1
DOCKER_GITCOMMIT="63fe64c" DOCKER_GITCOMMIT="990021a"
KEYWORDS="amd64" KEYWORDS="amd64"
fi fi

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

@ -5,6 +5,8 @@ Documentation=http://docs.docker.io
[Service] [Service]
Environment="TMPDIR=/var/tmp/" Environment="TMPDIR=/var/tmp/"
ExecStartPre=/bin/mount --make-rprivate / ExecStartPre=/bin/mount --make-rprivate /
LimitNOFILE=1048576
LimitNPROC=1048576
# 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 -s=btrfs -r=false -H fd:// ExecStart=/usr/bin/docker -d -s=btrfs -r=false -H fd://