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

Merge pull request #2006 from crawford/docker

Browse Source 
app-emulation/docker: backport a few fixes
This commit is contained in:
Alex Crawford 2016-06-15 10:08:38 -07:00 committed by GitHub
commit 3039d9df6c
2 changed files with 1 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.10.3-r3.ebuild → sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-1.10.3-r4.ebuild vendored
View File

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

@ -12,7 +12,7 @@ if [[ ${PV} == *9999 ]]; then
DOCKER_GITCOMMIT="unknown" DOCKER_GITCOMMIT="unknown"
KEYWORDS="~amd64 ~arm64" KEYWORDS="~amd64 ~arm64"
else else
CROS_WORKON_COMMIT="3cd164c9763106fee68873b376146c447a7f5b8d" # v1.10.3 + overlay/systemd cgroup fixes CROS_WORKON_COMMIT="1f8f5456c13bb31423776e886073bf44c33e2db5" # coreos-1.10.3
DOCKER_GITCOMMIT="${CROS_WORKON_COMMIT:0:7}" DOCKER_GITCOMMIT="${CROS_WORKON_COMMIT:0:7}"
KEYWORDS="amd64 arm64" KEYWORDS="amd64 arm64"
fi fi