diff options
| author |   Cédric Ollivier <cedric.ollivier@orange.com> | 2019-03-29 08:51:08 +0100 |
|---|---|---|
| committer | Cédric Ollivier <cedric.ollivier@orange.com> | 2019-03-29 08:51:08 +0100 |
| commit | 56fbecbcd1f9892cc1e40764b0e9aeef61135c96 (patch) | |
| tree | b78949e7455836efc1248f5e763d6334464a14fd | |
| parent | ae39188efdbb243f080e2d24fc480566f2f2dab8 (diff) | |
Only set go major version in parent container
It allows updating automatically the minor versions.
Change-Id: I25d3d315e533c1ba40f9eec36dc2eb9b81715eb2
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 852bc46d..8bc52ac2 100644 --- a/ansible/site.yml +++ b/ansible/site.yml @@ -13,7 +13,7 @@ - repo: _ dport: container: golang - tag: 1.11.6-alpine3.9 + tag: 1.11-alpine3.9 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-hunter" golang:1.11.6-alpine3.9 || true) + "${repo}/functest-kubernetes-core:amd64-hunter" golang:1.11-alpine3.9 || true) find . -name Dockerfile -exec git checkout {} + find . -name Dockerfile -exec sed -i \ - -e "s|golang:1.11.6-alpine3.9|arm64v8/golang:1.11.6-alpine3.9|g" {} + + -e "s|golang:1.11-alpine3.9|arm64v8/golang:1.11-alpine3.9|g" {} + find . -name Dockerfile -exec sed -i \ -e "s|opnfv/functest-kubernetes-core:hunter|\ ${repo}/functest-kubernetes-core:arm64-hunter|g" {} + @@ -49,7 +49,7 @@ for dir in ${arm64_dirs}; do done [ ! -z "${arm64_dirs}" ] && (docker rmi "${repo}/functest-kubernetes-core:arm64-hunter" \ - arm64v8/golang:1.11.6-alpine3.9 || true) + arm64v8/golang:1.11-alpine3.9 || true) find . -name Dockerfile -exec git checkout {} + exit $? diff --git a/docker/core/Dockerfile b/docker/core/Dockerfile index ab96ce0c..869a76f4 100644 --- a/docker/core/Dockerfile +++ b/docker/core/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.11.6-alpine3.9 +FROM golang:1.11-alpine3.9 ARG BRANCH=stable/hunter ARG OPENSTACK_TAG=stable/rocky |