diff options
| author |   Cédric Ollivier <cedric.ollivier@orange.com> | 2022-04-22 22:47:50 +0200 |
|---|---|---|
| committer | Cédric Ollivier <cedric.ollivier@orange.com> | 2022-04-22 22:48:21 +0200 |
| commit | 4c91aa8d974d95fec6b39741102327716a7cf20d (patch) | |
| tree | 9723f5e22f0375012871d48f91cd81935730cbcf | |
| parent | 33a884eae2153a2ea91b4bce79b06028e783e8bf (diff) | |
Update to Alpine 3.15
Change-Id: I283f95fa9c0a51b31c2612f44c1e722a688f6a02
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
| -rw-r--r-- | ansible/site.gate.yml | 2 | ||||
| -rw-r--r-- | build.sh | 4 | ||||
| -rw-r--r-- | docker/core/Dockerfile | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/ansible/site.gate.yml b/ansible/site.gate.yml index f2936320..d4de0bdd 100644 --- a/ansible/site.gate.yml +++ b/ansible/site.gate.yml @@ -8,7 +8,7 @@ docker_tags: - latest: branch: master - dependency: '3.14' + dependency: '3.15' builds: dependency: repo: _ @@ -24,12 +24,12 @@ build_opts=(--pull=true --no-cache --force-rm=true) for arch in ${arch}; do if [[ ${arch} == arm64 ]]; then find . -name Dockerfile -exec sed -i \ - -e "s|alpine:3.14|arm64v8/alpine:3.14|g" {} + + -e "s|alpine:3.15|arm64v8/alpine:3.15|g" {} + find . -name Dockerfile -exec sed -i \ -e "s|opnfv/xtesting|${repo}/xtesting:arm64-${tag}|g" {} + elif [[ ${arch} == arm ]]; then find . -name Dockerfile -exec sed -i \ - -e "s|alpine:3.14|arm32v6/alpine:3.14|g" {} + + -e "s|alpine:3.15|arm32v6/alpine:3.15|g" {} + find . -name Dockerfile -exec sed -i \ -e "s|opnfv/xtesting|${repo}/xtesting:arm-${tag}|g" {} + else diff --git a/docker/core/Dockerfile b/docker/core/Dockerfile index 3ee3570f..b083e36a 100644 --- a/docker/core/Dockerfile +++ b/docker/core/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.14 +FROM alpine:3.15 ARG BRANCH=master ARG OPENSTACK_TAG=master |