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

Merge pull request #1083 from crawford/docker

Browse Source 
app-emulation/docker: bump to v1.5.0
This commit is contained in:
Alex Crawford 2015-02-10 13:53:41 -08:00
commit d7dc419425
4 changed files with 3 additions and 1 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.4.1-r4.ebuild → sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-1.5.0.ebuild vendored
View File

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

@ -15,7 +15,7 @@ if [[ ${PV} == *9999 ]]; then
DOCKER_GITCOMMIT="" DOCKER_GITCOMMIT=""
KEYWORDS="" KEYWORDS=""
else else
CROS_WORKON_COMMIT="5bc2ff8a36e9a768e8b479de4fe3ea9c9daf4121" # v1.4.1 CROS_WORKON_COMMIT="a8a31eff10544860d2188dddabdee4d727545796" # v1.5.0
DOCKER_GITCOMMIT="${CROS_WORKON_COMMIT:0:7}" DOCKER_GITCOMMIT="${CROS_WORKON_COMMIT:0:7}"
KEYWORDS="amd64" KEYWORDS="amd64"
fi fi

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

@ -7,6 +7,7 @@ Requires=docker.socket early-docker.target
[Service] [Service]
Environment=TMPDIR=/var/tmp Environment=TMPDIR=/var/tmp
EnvironmentFile=-/run/flannel_docker_opts.env EnvironmentFile=-/run/flannel_docker_opts.env
MountFlags=slave
LimitNOFILE=1048576 LimitNOFILE=1048576
LimitNPROC=1048576 LimitNPROC=1048576
ExecStart=/usr/lib/coreos/dockerd --daemon --host=fd:// $DOCKER_OPTS $DOCKER_OPT_BIP $DOCKER_OPT_MTU $DOCKER_OPT_IPMASQ ExecStart=/usr/lib/coreos/dockerd --daemon --host=fd:// $DOCKER_OPTS $DOCKER_OPT_BIP $DOCKER_OPT_MTU $DOCKER_OPT_IPMASQ

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

@ -6,6 +6,7 @@ Requires=early-docker.socket
[Service] [Service]
Environment=TMPDIR=/var/tmp Environment=TMPDIR=/var/tmp
MountFlags=slave
LimitNOFILE=1048576 LimitNOFILE=1048576
LimitNPROC=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 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