mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2025-08-20 14:01:36 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #814 from crawford/docker

Browse Source 
app-emulation/docker: bump to v1.2.0
This commit is contained in:
Alex Crawford 2014-08-24 19:01:31 -07:00
commit 68fa5219d4
3 changed files with 3 additions and 3 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.1.2-r1.ebuild → sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-1.2.0.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="d84a070e476ce923dd03e28232564a87704613ab" # v1.1.2 CROS_WORKON_COMMIT="fa7b24f2c3948d1eb52453c609417a6bc7eba5dd" # v1.2.0
DOCKER_GITCOMMIT="d84a070" DOCKER_GITCOMMIT="fa7b24f"
KEYWORDS="amd64" KEYWORDS="amd64"
fi fi

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

@ -10,7 +10,7 @@ LimitNOFILE=1048576
LimitNPROC=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 --daemon --storage-driver=btrfs --host=fd://
[Install] [Install]
WantedBy=multi-user.target WantedBy=multi-user.target