diff options
| -rw-r--r-- | ansible/site.yml | 2 | ||||
| -rw-r--r-- | build.sh | 6 | ||||
| -rw-r--r-- | docker/core/Dockerfile | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/ansible/site.yml b/ansible/site.yml index 734aec05..b0baf064 100644 --- a/ansible/site.yml +++ b/ansible/site.yml @@ -10,7 +10,7 @@ - repo: _ dport: container: golang - tag: alpine3.10 + tag: 1.12-alpine3.10 steps: - name: build opnfv/functest-kubernetes-core containers: @@ -28,11 +28,11 @@ done [ ! -z "${amd64_dirs}" ] && (docker rmi \ "${repo}/functest-kubernetes-core:amd64-latest" \ - golang:alpine3.10 || true) + golang:1.12-alpine3.10 || true) find . -name Dockerfile -exec git checkout {} + find . -name Dockerfile -exec sed -i \ - -e "s|golang:alpine3.10|arm64v8/golang:alpine3.10|g" {} + + -e "s|golang:1.12-alpine3.10|arm64v8/golang:1.12-alpine3.10|g" {} + find . -name Dockerfile -exec sed -i \ -e "s|opnfv/functest-kubernetes-core|\ ${repo}/functest-kubernetes-core:arm64-latest|g" {} + @@ -49,7 +49,7 @@ for dir in ${arm64_dirs}; do done [ ! -z "${arm64_dirs}" ] && (docker rmi "${repo}/functest-kubernetes-core:arm64-latest" \ - arm64v8/golang:alpine3.10 || true) + arm64v8/golang:1.12-alpine3.10 || true) find . -name Dockerfile -exec git checkout {} + exit $? diff --git a/docker/core/Dockerfile b/docker/core/Dockerfile index 5ea3baa2..c6907a14 100644 --- a/docker/core/Dockerfile +++ b/docker/core/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:alpine3.10 +FROM golang:1.12-alpine3.10 ARG BRANCH=master ARG OPENSTACK_TAG=master |