diff options
| author |   Cédric Ollivier <cedric.ollivier@orange.com> | 2019-03-29 08:47:21 +0100 |
|---|---|---|
| committer | Cédric Ollivier <cedric.ollivier@orange.com> | 2019-03-29 08:47:21 +0100 |
| commit | c577ac3eb856b982498682abaa277fbfef882b0a (patch) | |
| tree | e9073c0269150e515a9f2f9736dcf97b71327202 | |
| parent | 33c6b9b12c3bae28e2c3df5395508c2d66287328 (diff) | |
Precise go version in parent container
Change-Id: I49133d0770c3c8a75c9a44172a771fadb6a19554
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
| -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 50b375ca..f6cd8a6f 100644 --- a/ansible/site.yml +++ b/ansible/site.yml @@ -13,7 +13,7 @@ - repo: _ dport: container: golang - tag: alpine3.8 + tag: 1.11-alpine3.8 steps: - name: build opnfv/functest-kubernetes-core containers: @@ -28,11 +28,11 @@ for dir in ${amd64_dirs}; do done [ ! -z "${amd64_dirs}" ] && (docker rmi \ - "${repo}/functest-kubernetes-core:amd64-gambia" golang:1.11.1-alpine3.8 || true) + "${repo}/functest-kubernetes-core:amd64-gambia" golang:1.11-alpine3.8 || true) find . -name Dockerfile -exec git checkout {} + find . -name Dockerfile -exec sed -i \ - -e "s|golang:1.11.1-alpine3.8|arm64v8/golang:alpine3.8|g" {} + + -e "s|golang:1.11-alpine3.8|arm64v8/golang:1.11-alpine3.8|g" {} + find . -name Dockerfile -exec sed -i \ -e "s|opnfv/functest-kubernetes-core:gambia|\ ${repo}/functest-kubernetes-core:arm64-gambia|g" {} + @@ -49,7 +49,7 @@ for dir in ${arm64_dirs}; do done [ ! -z "${arm64_dirs}" ] && (docker rmi "${repo}/functest-kubernetes-core:arm64-gambia" \ - arm64v8/golang:alpine3.8 || true) + arm64v8/golang:1.11-alpine3.8 || true) find . -name Dockerfile -exec git checkout {} + exit $? diff --git a/docker/core/Dockerfile b/docker/core/Dockerfile index 50d79c4a..18e045e4 100644 --- a/docker/core/Dockerfile +++ b/docker/core/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:alpine3.8 +FROM golang:1.11-alpine3.8 ARG BRANCH=stable/gambia ARG OPENSTACK_TAG=stable/queens |