diff options
| -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 6f3ed0ef..9586f9f6 100644 --- a/ansible/site.yml +++ b/ansible/site.yml @@ -12,8 +12,8 @@ dependencies: - repo: _ dport: - container: golang - tag: 1.12-alpine3.9 + container: alpine + tag: 3.9 steps: - name: build opnfv/functest-kubernetes-core containers: @@ -31,11 +31,11 @@ done [ ! -z "${amd64_dirs}" ] && (docker rmi \ "${repo}/functest-kubernetes-core:amd64-iruya" \ - golang:1.12-alpine3.9 || true) + alpine:3.9 || true) find . -name Dockerfile -exec git checkout {} + find . -name Dockerfile -exec sed -i \ - -e "s|golang:1.12-alpine3.9|arm64v8/golang:1.12-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:iruya|\ ${repo}/functest-kubernetes-core:arm64-iruya|g" {} + @@ -52,11 +52,11 @@ for dir in ${arm64_dirs}; do done [ ! -z "${arm64_dirs}" ] && (docker rmi "${repo}/functest-kubernetes-core:arm64-iruya" \ - arm64v8/golang:1.12-alpine3.9 || true) + arm64v8/alpine:3.9 || true) find . -name Dockerfile -exec git checkout {} + find . -name Dockerfile -exec sed -i \ - -e "s|golang:1.12-alpine3.9|arm32v7/golang:1.12-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:iruya|\ ${repo}/functest-kubernetes-core:arm-iruya|g" {} + @@ -73,7 +73,7 @@ for dir in ${arm_dirs}; do done [ ! -z "${arm_dirs}" ] && (docker rmi "${repo}/functest-kubernetes-core:arm-iruya" \ - arm32v7/golang:1.12-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 61e194d6..5c2086f9 100644 --- a/docker/core/Dockerfile +++ b/docker/core/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.12-alpine3.9 +FROM alpine:3.9 ARG BRANCH=stable/iruya ARG OPENSTACK_TAG=stable/stein |