diff options
| author |   Cédric Ollivier <cedric.ollivier@orange.com> | 2020-08-16 11:56:12 +0200 |
|---|---|---|
| committer | Cédric Ollivier <cedric.ollivier@orange.com> | 2020-08-16 14:05:08 +0200 |
| commit | d9a3a37f85c7c33cde9badbb6b48b893425f59c7 (patch) | |
| tree | 6a208c964bd5d9a718945ca1ea6bafe2cbc673f1 | |
| parent | 4cf2510ed3826a4a3c1c4ea7065f2b3eea7c0a00 (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)
| -rw-r--r-- | ansible/site.yml | 4 | ||||
| -rw-r--r-- | build.sh | 10 | ||||
| -rw-r--r-- | docker/core/Dockerfile | 2 |
3 files changed, 8 insertions, 8 deletions
diff --git a/ansible/site.yml b/ansible/site.yml index 33b74546..306d39d4 100644 --- a/ansible/site.yml +++ b/ansible/site.yml @@ -12,8 +12,8 @@ dependencies: - repo: _ dport: - container: golang - tag: 1.11-alpine3.9 + container: alpine + tag: 3.9 steps: - name: build opnfv/functest-kubernetes-core containers: @@ -30,11 +30,11 @@ done [ ! -z "${amd64_dirs}" ] && (docker rmi \ "${repo}/functest-kubernetes-core:amd64-hunter" \ - golang:1.11-alpine3.9 || true) + alpine:3.9 || true) find . -name Dockerfile -exec git checkout {} + find . -name Dockerfile -exec sed -i \ - -e "s|golang:1.11-alpine3.9|arm64v8/golang:1.11-alpine3.9|g" {} + + -e "s|alpine:3.9|arm64v8/alpine:3.9|g" {} + find . -name Dockerfile -exec sed -i \ -e "s|opnfv/functest-kubernetes-core:hunter|\ ${repo}/functest-kubernetes-core:arm64-hunter|g" {} + @@ -51,11 +51,11 @@ for dir in ${arm64_dirs}; do done [ ! -z "${arm64_dirs}" ] && (docker rmi "${repo}/functest-kubernetes-core:arm64-hunter" \ - arm64v8/golang:1.11-alpine3.9 || true) + arm64v8/alpine:3.9 || true) find . -name Dockerfile -exec git checkout {} + find . -name Dockerfile -exec sed -i \ - -e "s|golang:1.11-alpine3.9|arm32v7/golang:1.11-alpine3.9|g" {} + + -e "s|alpine:3.9|arm32v7/alpine:3.9|g" {} + find . -name Dockerfile -exec sed -i \ -e "s|opnfv/functest-kubernetes-core:hunter|\ ${repo}/functest-kubernetes-core:arm-hunter|g" {} + @@ -72,7 +72,7 @@ for dir in ${arm_dirs}; do done [ ! -z "${arm_dirs}" ] && (docker rmi "${repo}/functest-kubernetes-core:arm-hunter" \ - arm32v7/golang:1.11-alpine3.9 || true) + arm32v7/alpine:3.9 || true) find . -name Dockerfile -exec git checkout {} + exit $? diff --git a/docker/core/Dockerfile b/docker/core/Dockerfile index 069255ed..bb917175 100644 --- a/docker/core/Dockerfile +++ b/docker/core/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.11-alpine3.9 +FROM alpine:3.9 ARG BRANCH=stable/hunter ARG OPENSTACK_TAG=stable/rocky |