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

Merge pull request #394 from flatcar-linux/docker-19.03.11-alpha

Browse Source 
Upgrade Docker in Alpha from 19.03.8 to 19.03.11
This commit is contained in:
Dongsu Park 2020-06-26 09:14:20 +02:00 committed by GitHub
commit 3191861b0e
7 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -7,7 +7,7 @@ GITHUB_URI="github.com/opencontainers/runc"
COREOS_GO_PACKAGE="${GITHUB_URI}" COREOS_GO_PACKAGE="${GITHUB_URI}"
COREOS_GO_VERSION="go1.13" COREOS_GO_VERSION="go1.13"
# the commit of runc that docker uses. # the commit of runc that docker uses.
# see https://github.com/docker/docker-ce/blob/v19.03.8/components/engine/hack/dockerfile/install/runc.installer#L4 # see https://github.com/docker/docker-ce/blob/v19.03.11/components/engine/hack/dockerfile/install/runc.installer#L4
# Update the patch number when this commit is changed (i.e. the _p in the ebuild). # Update the patch number when this commit is changed (i.e. the _p in the ebuild).
# The patch version is arbitrarily the number of commits since the tag version # The patch version is arbitrarily the number of commits since the tag version
# specified in the ebuild name. For example: # specified in the ebuild name. For example:

2
sdk_container/src/third_party/coreos-overlay/app-emulation/docker/Manifest vendored
View File

@ -1 +1 @@
DIST docker-19.03.8.tar.gz 17477887 BLAKE2B f9c50fb376b37b19de79f52f10425432f5042bdc25a581e1f2cf7524d2e89dd6bd5ac8181f23a7ee00e36b07e3ce62b631aff28844963f8b05e21ce7671bfe6c SHA512 2e2266d4cc832c2c2afb7c0fba92ffd39b92cce988c9bedd40430eb87fa97c32dcf97d8e4c651ceda7c292c904f83c49a12e39861a9a69c9c9e6d54770f95d02 DIST docker-19.03.11.tar.gz 17962968 BLAKE2B e0d227f00e9444b2b561d17f1ed78989fdcb9ce6f7c70176648e4f80d3e226b788a21bfbc72bfdd759621f5aebfd44c4afb1952b01a16ce3fcbc1fe086477dcf SHA512 316023781ba1b7f7732c4e898482c243ad0c487b19ddbb6f0db668f1fed64892367d4a88d8aae8dc99336900fa33d0cab1b2d7ec0070f1187d03e58b79bb636b

0
sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-19.03.8.ebuild → sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-19.03.11.ebuild vendored
View File

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

@ -19,7 +19,7 @@ else
else else
MY_PV="$PV" MY_PV="$PV"
fi fi
DOCKER_GITCOMMIT="9368c53" DOCKER_GITCOMMIT="1d3ea1a"
SRC_URI="https://${COREOS_GO_PACKAGE}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz" SRC_URI="https://${COREOS_GO_PACKAGE}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
KEYWORDS="amd64 arm64" KEYWORDS="amd64 arm64"
[ "$DOCKER_GITCOMMIT" ] || die "DOCKER_GITCOMMIT must be added manually for each bump!" [ "$DOCKER_GITCOMMIT" ] || die "DOCKER_GITCOMMIT must be added manually for each bump!"

2
sdk_container/src/third_party/coreos-overlay/app-torcx/docker/docker-19.03.ebuild vendored
View File

@ -11,7 +11,7 @@ KEYWORDS="amd64 arm64"
# Explicitly list all packages that will be built into the image. # Explicitly list all packages that will be built into the image.
RDEPEND=" RDEPEND="
~app-emulation/docker-19.03.8 ~app-emulation/docker-19.03.11
~app-emulation/containerd-1.3.4 ~app-emulation/containerd-1.3.4
~app-emulation/docker-proxy-0.8.0_p20180709 ~app-emulation/docker-proxy-0.8.0_p20180709
~app-emulation/docker-runc-1.0.0_rc10 ~app-emulation/docker-runc-1.0.0_rc10

2
sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/docker-19.03.8 → sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/docker-19.03.11 vendored
View File

@ -10,6 +10,6 @@ RDEPEND=>=dev-db/sqlite-3.7.9:3 device-mapper? ( >=sys-fs/lvm2-2.02.89[thin] ) s
REQUIRED_USE=go_version_go1_12 REQUIRED_USE=go_version_go1_12
RESTRICT=installsources strip RESTRICT=installsources strip
SLOT=0 SLOT=0
SRC_URI=https://github.com/docker/docker-ce/archive/v19.03.8.tar.gz -> docker-19.03.8.tar.gz SRC_URI=https://github.com/docker/docker-ce/archive/v19.03.11.tar.gz -> docker-19.03.11.tar.gz
_eclasses_=bash-completion-r1 47a7402d95930413ce25ba8d857339bb coreos-go-depend 90f5716bc80a5aea57dbb393aa0cabdf coreos-go-utils 67004337b6f831adc5f1ff107ee2f157 desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic a09389deba2c0a7108b581e02c7cecbf linux-info 953c3b1c472dcadbf62098a9301327f2 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 8c7f9d80beedd16f2e5a7f612c609529 udev 7752f306eec7b286d00bdb47b763e7ac user 7b7fc6ec5eb1c1eee55b0609f01e7362 user-info a2abd4e2f4c3b9b06d64bf1329359a02 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 _eclasses_=bash-completion-r1 47a7402d95930413ce25ba8d857339bb coreos-go-depend 90f5716bc80a5aea57dbb393aa0cabdf coreos-go-utils 67004337b6f831adc5f1ff107ee2f157 desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic a09389deba2c0a7108b581e02c7cecbf linux-info 953c3b1c472dcadbf62098a9301327f2 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 8c7f9d80beedd16f2e5a7f612c609529 udev 7752f306eec7b286d00bdb47b763e7ac user 7b7fc6ec5eb1c1eee55b0609f01e7362 user-info a2abd4e2f4c3b9b06d64bf1329359a02 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748
_md5_=8273d6c17fda0c94ff2b25a38e3942a7 _md5_=8273d6c17fda0c94ff2b25a38e3942a7

4
sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-torcx/docker-19.03 vendored
View File

@ -3,6 +3,6 @@ DESCRIPTION=Packages to be installed in a torcx image for Docker
EAPI=2 EAPI=2
KEYWORDS=amd64 arm64 KEYWORDS=amd64 arm64
LICENSE=GPL-2 LICENSE=GPL-2
RDEPEND=~app-emulation/docker-19.03.8 ~app-emulation/containerd-1.3.4 ~app-emulation/docker-proxy-0.8.0_p20180709 ~app-emulation/docker-runc-1.0.0_rc10 =dev-libs/libltdl-2.4.6 =sys-process/tini-0.18.0 RDEPEND=~app-emulation/docker-19.03.11 ~app-emulation/containerd-1.3.4 ~app-emulation/docker-proxy-0.8.0_p20180709 ~app-emulation/docker-runc-1.0.0_rc10 =dev-libs/libltdl-2.4.6 =sys-process/tini-0.18.0
SLOT=0 SLOT=0
_md5_=a4185eb886c25702cdb2aaf0ae345e4f _md5_=f32bf4b23c1646516d5634547b6cd765