aboutsummaryrefslogtreecommitdiffstats
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 11:56:12 +0200
commit1af6a5dc4ec8e087613275e912c819ea1d0aecbc (patch)
tree9735e31607c4b68c472f536e343331f5910f3d31
parent6801612e85c485e9885cfb41cbc84771475a134f (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>
-rw-r--r--ansible/site.yml4
-rw-r--r--build.sh10
-rw-r--r--docker/core/Dockerfile2
3 files changed, 8 insertions, 8 deletions
diff --git a/ansible/site.yml b/ansible/site.yml
index 0a12e2c3..b1294951 100644
--- a/ansible/site.yml
+++ b/ansible/site.yml
@@ -9,8 +9,8 @@
dependencies:
- repo: _
dport:
- container: golang
- tag: 1.15-alpine3.12
+ container: alpine
+ tag: 3.12
steps:
- name: build opnfv/functest-kubernetes-core
containers:
diff --git a/build.sh b/build.sh
index 05aa529f..8fb23242 100644
--- a/build.sh
+++ b/build.sh
@@ -31,11 +31,11 @@ done
[ ! -z "${amd64_dirs}" ] &&
(docker rmi \
"${repo}/functest-kubernetes-core:amd64-latest" \
- golang:1.13-alpine3.12 || true)
+ alpine:3.12 || true)
find . -name Dockerfile -exec git checkout {} +
find . -name Dockerfile -exec sed -i \
- -e "s|golang:1.15-alpine3.12|arm64v8/golang:1.15-alpine3.12|g" {} +
+ -e "s|alpine:3.12|arm64v8/alpine:3.12|g" {} +
find . -name Dockerfile -exec sed -i \
-e "s|opnfv/functest-kubernetes-core|\
${repo}/functest-kubernetes-core:arm64-latest|g" {} +
@@ -52,11 +52,11 @@ for dir in ${arm64_dirs}; do
done
[ ! -z "${arm64_dirs}" ] &&
(docker rmi "${repo}/functest-kubernetes-core:arm64-latest" \
- arm64v8/golang:1.15-alpine3.12 || true)
+ arm64v8/alpine:3.12 || true)
find . -name Dockerfile -exec git checkout {} +
find . -name Dockerfile -exec sed -i \
- -e "s|golang:1.15-alpine3.12|arm32v7/golang:1.15-alpine3.12|g" {} +
+ -e "s|alpine:3.12|arm32v7/alpine:3.12|g" {} +
find . -name Dockerfile -exec sed -i \
-e "s|opnfv/functest-kubernetes-core|\
${repo}/functest-kubernetes-core:arm-latest|g" {} +
@@ -73,7 +73,7 @@ for dir in ${arm_dirs}; do
done
[ ! -z "${arm_dirs}" ] &&
(docker rmi "${repo}/functest-kubernetes-core:arm-latest" \
- arm32v7/golang:1.15-alpine3.12 || true)
+ arm32v7/alpine:3.12 || true)
find . -name Dockerfile -exec git checkout {} +
exit $?
diff --git a/docker/core/Dockerfile b/docker/core/Dockerfile
index 6cddfcb7..fd7a40be 100644
--- a/docker/core/Dockerfile
+++ b/docker/core/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.15-alpine3.12
+FROM alpine:3.12
ARG BRANCH=master
ARG OPENSTACK_TAG=master