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

Merge pull request #1000 from marineam/docker

Browse Source 
docker: require btrfs-progs >= 3.16.1 for master branch
This commit is contained in:
Michael Marineau 2014-12-10 22:18:26 -08:00
commit 03890c644b
4 changed files with 11 additions and 5 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.3.2-r1.ebuild → sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-1.3.2-r2.ebuild vendored
View File

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

@ -13,9 +13,13 @@ CROS_WORKON_REPO="git://github.com"
GITHUB_URI="github.com/crosbymichael/docker" GITHUB_URI="github.com/crosbymichael/docker"
# TODO: Remove this logic once we cross the 1.4.0 threshold
BTRFS_VER="0.20"
if [[ ${PV} == *9999 ]]; then if [[ ${PV} == *9999 ]]; then
DOCKER_GITCOMMIT="deadbee" DOCKER_GITCOMMIT="deadbee"
KEYWORDS="~amd64" KEYWORDS="~amd64"
BTRFS_VER="3.16.1"
else else
CROS_WORKON_COMMIT="39fa2faad2f3d6fa5133de4eb740677202f53ef4" # v1.3.2 CROS_WORKON_COMMIT="39fa2faad2f3d6fa5133de4eb740677202f53ef4" # v1.3.2
DOCKER_GITCOMMIT="39fa2fa" DOCKER_GITCOMMIT="39fa2fa"
@ -38,7 +42,7 @@ DEPEND="
${CDEPEND} ${CDEPEND}
>=dev-lang/go-1.2 >=dev-lang/go-1.2
btrfs? ( btrfs? (
>=sys-fs/btrfs-progs-0.20 >=sys-fs/btrfs-progs-${BTRFS_VER}
) )
dev-vcs/git dev-vcs/git
dev-vcs/mercurial dev-vcs/mercurial

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

@ -5,14 +5,15 @@ After=docker.socket early-docker.target
Requires=docker.socket early-docker.target Requires=docker.socket early-docker.target
[Service] [Service]
Environment="TMPDIR=/var/tmp/" Environment=TMPDIR=/var/tmp
Environment=DOCKER_DRIVER=btrfs
ExecStartPre=/bin/mount --make-rprivate / ExecStartPre=/bin/mount --make-rprivate /
EnvironmentFile=-/run/docker_opts.env EnvironmentFile=-/run/docker_opts.env
LimitNOFILE=1048576 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 --daemon --storage-driver=btrfs --host=fd:// $DOCKER_OPTS ExecStart=/usr/bin/docker --daemon --host=fd:// $DOCKER_OPTS
[Install] [Install]
WantedBy=multi-user.target WantedBy=multi-user.target

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

@ -5,13 +5,14 @@ After=early-docker.socket
Requires=early-docker.socket Requires=early-docker.socket
[Service] [Service]
Environment="TMPDIR=/var/tmp/" Environment=TMPDIR=/var/tmp
Environment=DOCKER_DRIVER=btrfs
ExecStartPre=/bin/mount --make-rprivate / ExecStartPre=/bin/mount --make-rprivate /
LimitNOFILE=1048576 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 --daemon --storage-driver=btrfs --host=fd:// --bridge=none --iptables=false --ip-masq=false --graph=/var/lib/early-docker --pidfile=/var/run/early-docker.pid ExecStart=/usr/bin/docker --daemon --host=fd:// --bridge=none --iptables=false --ip-masq=false --graph=/var/lib/early-docker --pidfile=/var/run/early-docker.pid
[Install] [Install]
WantedBy=early-docker.target WantedBy=early-docker.target