summaryrefslogtreecommitdiffstats
path: root/build.sh
diff options
context:
space:
mode:
authorCédric Ollivier <cedric.ollivier@orange.com>2019-03-29 08:51:08 +0100
committerCédric Ollivier <cedric.ollivier@orange.com>2019-03-29 08:51:08 +0100
commit56fbecbcd1f9892cc1e40764b0e9aeef61135c96 (patch)
treeb78949e7455836efc1248f5e763d6334464a14fd /build.sh
parentae39188efdbb243f080e2d24fc480566f2f2dab8 (diff)
Only set go major version in parent container
It allows updating automatically the minor versions. Change-Id: I25d3d315e533c1ba40f9eec36dc2eb9b81715eb2 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 a186f496..6870beb9 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-hunter" golang:1.11.6-alpine3.9 || true)
+ "${repo}/functest-kubernetes-core:amd64-hunter" golang:1.11-alpine3.9 || true)
find . -name Dockerfile -exec git checkout {} +
find . -name Dockerfile -exec sed -i \
- -e "s|golang:1.11.6-alpine3.9|arm64v8/golang:1.11.6-alpine3.9|g" {} +
+ -e "s|golang:1.11-alpine3.9|arm64v8/golang:1.11-alpine3.9|g" {} +
find . -name Dockerfile -exec sed -i \
-e "s|opnfv/functest-kubernetes-core:hunter|\
${repo}/functest-kubernetes-core:arm64-hunter|g" {} +
@@ -49,7 +49,7 @@ for dir in ${arm64_dirs}; do
done
[ ! -z "${arm64_dirs}" ] &&
(docker rmi "${repo}/functest-kubernetes-core:arm64-hunter" \
- arm64v8/golang:1.11.6-alpine3.9 || true)
+ arm64v8/golang:1.11-alpine3.9 || true)
find . -name Dockerfile -exec git checkout {} +
exit $?