aboutsummaryrefslogtreecommitdiffstats
path: root/build.sh
diff options
context:
space:
mode:
authorCédric Ollivier <cedric.ollivier@orange.com>2020-08-16 11:56:12 +0200
committerCédric Ollivier <cedric.ollivier@orange.com>2020-08-16 14:00:02 +0200
commit76265bfab6197d657a940ed99391463015f435a1 (patch)
treec1c233fee2e2a2ccd85b0a8edae8270c9515bb86 /build.sh
parentf6e8c84e8ebbc130239904ca5811984272e3839e (diff)
Leverage alpine rather than golang
golang is now useless as we stop compiling kubernetes binaries. Change-Id: I7b9416281de069d1f454b13eff6e9e6107f7471e Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com> (cherry picked from commit 1af6a5dc4ec8e087613275e912c819ea1d0aecbc)
Diffstat (limited to 'build.sh')
-rw-r--r--build.sh10
1 files changed, 5 insertions, 5 deletions
diff --git a/build.sh b/build.sh
index c8a98d2b..7074e0f3 100644
--- a/build.sh
+++ b/build.sh
@@ -31,11 +31,11 @@ done
[ ! -z "${amd64_dirs}" ] &&
(docker rmi \
"${repo}/functest-kubernetes-core:amd64-jerma" \
- golang:1.13-alpine3.10 || true)
+ alpine:3.10 || true)
find . -name Dockerfile -exec git checkout {} +
find . -name Dockerfile -exec sed -i \
- -e "s|golang:1.13-alpine3.10|arm64v8/golang:1.13-alpine3.10|g" {} +
+ -e "s|alpine:3.10|arm64v8/alpine:3.10|g" {} +
find . -name Dockerfile -exec sed -i \
-e "s|opnfv/functest-kubernetes-core:jerma|\
${repo}/functest-kubernetes-core:arm64-jerma|g" {} +
@@ -52,11 +52,11 @@ for dir in ${arm64_dirs}; do
done
[ ! -z "${arm64_dirs}" ] &&
(docker rmi "${repo}/functest-kubernetes-core:arm64-jerma" \
- arm64v8/golang:1.13-alpine3.10 || true)
+ arm64v8/alpine:3.10 || true)
find . -name Dockerfile -exec git checkout {} +
find . -name Dockerfile -exec sed -i \
- -e "s|golang:1.13-alpine3.10|arm32v7/golang:1.13-alpine3.10|g" {} +
+ -e "s|alpine:3.10|arm32v7/alpine:3.10|g" {} +
find . -name Dockerfile -exec sed -i \
-e "s|opnfv/functest-kubernetes-core:jerma|\
${repo}/functest-kubernetes-core:arm-jerma|g" {} +
@@ -73,7 +73,7 @@ for dir in ${arm_dirs}; do
done
[ ! -z "${arm_dirs}" ] &&
(docker rmi "${repo}/functest-kubernetes-core:arm-jerma" \
- arm32v7/golang:1.13-alpine3.10 || true)
+ arm32v7/alpine:3.10 || true)
find . -name Dockerfile -exec git checkout {} +
exit $?