diff options
| -rw-r--r-- | ansible/site.cntt.yml | 2 | ||||
| -rw-r--r-- | ansible/site.yml | 2 | ||||
| -rw-r--r-- | build.sh | 10 | ||||
| -rw-r--r-- | docker/core/Dockerfile | 2 | ||||
| -rw-r--r-- | docker/vnf/Dockerfile | 2 |
5 files changed, 9 insertions, 9 deletions
diff --git a/ansible/site.cntt.yml b/ansible/site.cntt.yml index 8a290c812..0b5629013 100644 --- a/ansible/site.cntt.yml +++ b/ansible/site.cntt.yml @@ -10,7 +10,7 @@ - repo: _ dport: container: alpine - tag: '3.11' + tag: '3.12' steps: - name: build opnfv/functest-core containers: diff --git a/ansible/site.yml b/ansible/site.yml index 0c386e0e7..f823f2068 100644 --- a/ansible/site.yml +++ b/ansible/site.yml @@ -10,7 +10,7 @@ - repo: _ dport: container: alpine - tag: '3.11' + tag: '3.12' steps: - name: build opnfv/functest-core containers: @@ -34,11 +34,11 @@ for dir in ${amd64_dirs}; do (docker rmi "${repo}/functest-${dir##**/}:amd64-latest" || true) done [ -n "${amd64_dirs}" ] && - (docker rmi "${repo}/functest-core:amd64-latest" alpine:3.11 || true) + (docker rmi "${repo}/functest-core:amd64-latest" alpine:3.12 || true) find . -name Dockerfile -exec git checkout {} + find . -name Dockerfile -exec sed -i \ - -e "s|alpine:3.11|arm64v8/alpine:3.11|g" {} + + -e "s|alpine:3.12|arm64v8/alpine:3.12|g" {} + find . -name Dockerfile -exec sed -i \ -e "s|opnfv/functest-core|${repo}/functest-core:arm64-latest|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-latest" \ - arm64v8/alpine:3.11 || true) + arm64v8/alpine:3.12 || true) find . -name Dockerfile -exec git checkout {} + find . -name Dockerfile -exec sed -i \ - -e "s|alpine:3.11|arm32v6/alpine:3.11|g" {} + + -e "s|alpine:3.12|arm32v6/alpine:3.12|g" {} + find . -name Dockerfile -exec sed -i \ -e "s|opnfv/functest-core|${repo}/functest-core:arm-latest|g" {} + find . -name Dockerfile -exec sed -i \ @@ -70,7 +70,7 @@ for dir in ${arm_dirs}; do done [ -n "${arm_dirs}" ] && (docker rmi "${repo}/functest-core:arm-latest" \ - arm32v6/alpine:3.11 || true) + arm32v6/alpine:3.12 || true) find . -name Dockerfile -exec git checkout {} + exit $? diff --git a/docker/core/Dockerfile b/docker/core/Dockerfile index 5c5008b3d..502e87f93 100644 --- a/docker/core/Dockerfile +++ b/docker/core/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.11 +FROM alpine:3.12 ARG BRANCH=master ARG OPENSTACK_TAG=master diff --git a/docker/vnf/Dockerfile b/docker/vnf/Dockerfile index 38ca42d21..3e477c05c 100644 --- a/docker/vnf/Dockerfile +++ b/docker/vnf/Dockerfile @@ -22,7 +22,7 @@ RUN apk --no-cache add --update \ ruby ruby-bundler ruby-irb ruby-rdoc \ procps libxslt libxml2 zlib libffi go musl-dev && \ apk --no-cache add --virtual .build-deps --update \ - ruby-dev g++ make libxslt-dev libxml2-dev zlib-dev libffi-dev && \ + ruby-dev g++ make libxslt-dev libxml2-dev zlib-dev libffi-dev patch && \ wget -q -O- https://opendev.org/openstack/requirements/raw/branch/$OPENSTACK_TAG/upper-constraints.txt > upper-constraints.txt && \ sed -i -E /^tempest==+.*$/d upper-constraints.txt && \ case $(uname -m) in aarch*|arm*) sed -i -E /^PyNaCl=/d upper-constraints.txt ;; esac && \ |