aboutsummaryrefslogtreecommitdiffstats
path: root/build.sh
diff options
context:
space:
mode:
authorCédric Ollivier <cedric.ollivier@orange.com>2019-03-29 08:56:33 +0100
committerCédric Ollivier <cedric.ollivier@orange.com>2019-03-29 08:56:33 +0100
commit277ddd145f3a8a7495ed9dba4676048e47e52d86 (patch)
tree2c6ae6707c74389f1b5b75a899c33f4c310605e9 /build.sh
parent353482fd8ae27a53ee455242d207259ddd0a75a6 (diff)
Only set go major version in parent container
It allows updating automatically the minor versions. Change-Id: If6b8bcd1d7508653f4e28e4c1025bcd970ed98bf Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
Diffstat (limited to 'build.sh')
-rw-r--r--build.sh6
1 files changed, 3 insertions, 3 deletions
diff --git a/build.sh b/build.sh
index 3093deb9..7dce178c 100644
--- a/build.sh
+++ b/build.sh
@@ -28,11 +28,11 @@ for dir in ${amd64_dirs}; do
done
[ ! -z "${amd64_dirs}" ] &&
(docker rmi \
- "${repo}/functest-kubernetes-core:amd64-iruya" golang:1.12.1-alpine3.9 || true)
+ "${repo}/functest-kubernetes-core:amd64-iruya" golang:1.12-alpine3.9 || true)
find . -name Dockerfile -exec git checkout {} +
find . -name Dockerfile -exec sed -i \
- -e "s|golang:1.12.1-alpine3.9|arm64v8/golang:1.12.1-alpine3.9|g" {} +
+ -e "s|golang:1.12-alpine3.9|arm64v8/golang:1.12-alpine3.9|g" {} +
find . -name Dockerfile -exec sed -i \
-e "s|opnfv/functest-kubernetes-core:iruya|\
${repo}/functest-kubernetes-core:arm64-iruya|g" {} +
@@ -49,7 +49,7 @@ for dir in ${arm64_dirs}; do
done
[ ! -z "${arm64_dirs}" ] &&
(docker rmi "${repo}/functest-kubernetes-core:arm64-iruya" \
- arm64v8/golang:1.11.6-alpine3.9 || true)
+ arm64v8/golang:1.12-alpine3.9 || true)
find . -name Dockerfile -exec git checkout {} +
exit $?