aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCedric Ollivier <cedric.ollivier@orange.com>2019-01-18 20:56:55 +0000
committerGerrit Code Review <gerrit@opnfv.org>2019-01-18 20:56:55 +0000
commit14e03602d9d4d58bb64e0ee6c82e700a09d1132a (patch)
tree206ec4a95195f9efd1f07536d8f828d970275c7a
parent18321aac4b1abbaef0c5b1c1645bffc7c02ed2ff (diff)
parente909142ed04d9dabb35cddf9e62671026d8f9cf7 (diff)
Merge "Switch to golang:alpine3.8 as based image" into stable/gambia
-rw-r--r--build.sh4
-rw-r--r--docker/core/Dockerfile2
2 files changed, 3 insertions, 3 deletions
diff --git a/build.sh b/build.sh
index 7bb563e4..8a8bdf35 100644
--- a/build.sh
+++ b/build.sh
@@ -32,7 +32,7 @@ done
find . -name Dockerfile -exec git checkout {} +
find . -name Dockerfile -exec sed -i \
- -e "s|golang:1.11.1-alpine3.8|arm64v8/golang:1.11.1-alpine3.8|g" {} +
+ -e "s|golang:1.11.1-alpine3.8|arm64v8/golang: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:1.11.1-alpine3.8 || true)
+ arm64v8/golang:alpine3.8 || true)
find . -name Dockerfile -exec git checkout {} +
exit $?
diff --git a/docker/core/Dockerfile b/docker/core/Dockerfile
index 1d4e0258..50d79c4a 100644
--- a/docker/core/Dockerfile
+++ b/docker/core/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.11.1-alpine3.8
+FROM golang:alpine3.8
ARG BRANCH=stable/gambia
ARG OPENSTACK_TAG=stable/queens