mirror of
https://github.com/flatcar/scripts.git
synced 2025-08-19 05:21:23 +02:00
Merge pull request #396 from flatcar-linux/dongsu/docker-go1.13-alpha
app-emulation/docker: set go1.13 in DOCKER_BUILDTAGS for alpha
This commit is contained in:
commit
cc2fcb56a1
@ -4,7 +4,7 @@
|
|||||||
EAPI=6
|
EAPI=6
|
||||||
|
|
||||||
COREOS_GO_PACKAGE="github.com/docker/docker-ce"
|
COREOS_GO_PACKAGE="github.com/docker/docker-ce"
|
||||||
COREOS_GO_VERSION="go1.12"
|
COREOS_GO_VERSION="go1.13"
|
||||||
|
|
||||||
if [[ ${PV} = *9999* ]]; then
|
if [[ ${PV} = *9999* ]]; then
|
||||||
# Docker cannot be fetched via "go get", thanks to autogenerated code
|
# Docker cannot be fetched via "go get", thanks to autogenerated code
|
||||||
@ -231,6 +231,10 @@ src_compile() {
|
|||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
|
|
||||||
|
# need to set go1.13 in DOCKER_BUILDTAGS, to avoid build
|
||||||
|
# failures caused by github.com/pkg/errors >= 0.9.1.
|
||||||
|
DOCKER_BUILDTAGS+=" go1.13"
|
||||||
|
|
||||||
pushd components/engine || die
|
pushd components/engine || die
|
||||||
|
|
||||||
if use hardened; then
|
if use hardened; then
|
||||||
|
Loading…
x
Reference in New Issue
Block a user