diff options
| author |   Cédric Ollivier <cedric.ollivier@orange.com> | 2023-03-06 13:02:21 +0100 |
|---|---|---|
| committer | Cédric Ollivier <cedric.ollivier@orange.com> | 2023-03-06 13:52:41 +0100 |
| commit | 1aa55fbdfe0271664cf20ce9c2e7ad579901502f (patch) | |
| tree | 7d2e07679575e379be12fe1d1aedc7a8140f7d8f | |
| parent | 8363d257b7196a6c85395ad54b21054bc60c989d (diff) | |
Upgrade to Alpine 3.17
Change-Id: Ia9d64a094e787e0693fab3c59deb33e2404ccfc6
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
| -rw-r--r-- | ansible/site.gate.yml | 2 | ||||
| -rw-r--r-- | build.sh | 10 | ||||
| -rw-r--r-- | docker/core/Dockerfile | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/ansible/site.gate.yml b/ansible/site.gate.yml index 7924bd6a9..d9a586127 100644 --- a/ansible/site.gate.yml +++ b/ansible/site.gate.yml @@ -10,7 +10,7 @@ - repo: _ dport: container: alpine - tag: '3.14' + tag: '3.17' steps: - name: build opnfv/functest-core containers: @@ -31,11 +31,11 @@ for dir in ${amd64_dirs}; do (docker rmi "${repo}/functest-${dir##**/}:amd64-zed" || true) done [ -n "${amd64_dirs}" ] && - (docker rmi "${repo}/functest-core:amd64-zed" alpine:3.14 || true) + (docker rmi "${repo}/functest-core:amd64-zed" alpine:3.17 || true) find . -name Dockerfile -exec git checkout {} + find . -name Dockerfile -exec sed -i \ - -e "s|alpine:3.14|arm64v8/alpine:3.14|g" {} + + -e "s|alpine:3.17|arm64v8/alpine:3.17|g" {} + find . -name Dockerfile -exec sed -i \ -e "s|opnfv/functest-core:zed|${repo}/functest-core:arm64-zed|g" {} + find . -name Dockerfile -exec sed -i \ @@ -52,11 +52,11 @@ for dir in ${arm64_dirs}; do done [ -n "${arm64_dirs}" ] && (docker rmi "${repo}/functest-core:arm64-zed" \ - arm64v8/alpine:3.14 || true) + arm64v8/alpine:3.17 || true) find . -name Dockerfile -exec git checkout {} + find . -name Dockerfile -exec sed -i \ - -e "s|alpine:3.14|arm32v6/alpine:3.14|g" {} + + -e "s|alpine:3.17|arm32v6/alpine:3.17|g" {} + find . -name Dockerfile -exec sed -i \ -e "s|opnfv/functest-core:zed|${repo}/functest-core:arm-zed|g" {} + find . -name Dockerfile -exec sed -i \ @@ -73,7 +73,7 @@ for dir in ${arm_dirs}; do done [ -n "${arm_dirs}" ] && (docker rmi "${repo}/functest-core:arm-zed" \ - arm32v6/alpine:3.14 || true) + arm32v6/alpine:3.17 || true) find . -name Dockerfile -exec git checkout {} + exit $? diff --git a/docker/core/Dockerfile b/docker/core/Dockerfile index 3aef50c0a..6c7574e0e 100644 --- a/docker/core/Dockerfile +++ b/docker/core/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.16 +FROM alpine:3.17 ARG BRANCH=stable/zed ARG OPENSTACK_TAG=stable/zed |