diff options
| author |   Cédric Ollivier <cedric.ollivier@orange.com> | 2023-03-13 14:39:06 +0100 |
|---|---|---|
| committer | Cédric Ollivier <cedric.ollivier@orange.com> | 2023-03-13 14:40:31 +0100 |
| commit | ce409b3c2925c1f56ab1311a584240914b911821 (patch) | |
| tree | 1f059364eb6ce2a035ff984177e8d46be6596243 | |
| parent | 0e1b036ed4f4527c09cf1355a707875f640ee569 (diff) | |
Revert to Alpine 3.16
ruby-bundler 2.3.26-r0 as proposed in Alpine 3.17 seems buggy
https://github.com/googleapis/google-cloud-ruby/issues/19266
Change-Id: Ifcb6ba3e92d2ee5f21db859f6ee143a998dd6237
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 d9a586127..cc6dce058 100644 --- a/ansible/site.gate.yml +++ b/ansible/site.gate.yml @@ -10,7 +10,7 @@ - repo: _ dport: container: alpine - tag: '3.17' + tag: '3.16' steps: - name: build opnfv/functest-core containers: @@ -31,11 +31,11 @@ for dir in ${amd64_dirs}; do (docker rmi "${repo}/functest-${dir##**/}:amd64-yoga" || true) done [ -n "${amd64_dirs}" ] && - (docker rmi "${repo}/functest-core:amd64-yoga" alpine:3.17 || true) + (docker rmi "${repo}/functest-core:amd64-yoga" alpine:3.16 || true) find . -name Dockerfile -exec git checkout {} + find . -name Dockerfile -exec sed -i \ - -e "s|alpine:3.17|arm64v8/alpine:3.17|g" {} + + -e "s|alpine:3.16|arm64v8/alpine:3.16|g" {} + find . -name Dockerfile -exec sed -i \ -e "s|opnfv/functest-core:yoga|${repo}/functest-core:arm64-yoga|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-yoga" \ - arm64v8/alpine:3.17 || true) + arm64v8/alpine:3.16 || true) find . -name Dockerfile -exec git checkout {} + find . -name Dockerfile -exec sed -i \ - -e "s|alpine:3.17|arm32v6/alpine:3.17|g" {} + + -e "s|alpine:3.16|arm32v6/alpine:3.16|g" {} + find . -name Dockerfile -exec sed -i \ -e "s|opnfv/functest-core:yoga|${repo}/functest-core:arm-yoga|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-yoga" \ - arm32v6/alpine:3.17 || true) + arm32v6/alpine:3.16 || true) find . -name Dockerfile -exec git checkout {} + exit $? diff --git a/docker/core/Dockerfile b/docker/core/Dockerfile index 30a05ba15..2a7fc75c7 100644 --- a/docker/core/Dockerfile +++ b/docker/core/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.17 +FROM alpine:3.16 ARG BRANCH=stable/yoga ARG OPENSTACK_TAG=stable/yoga |