diff options
| -rw-r--r-- | ansible/site.yml | 2 | ||||
| -rw-r--r-- | build.sh | 4 | ||||
| -rw-r--r-- | docker/Dockerfile | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/ansible/site.yml b/ansible/site.yml index b042d57b..ccc42b3f 100644 --- a/ansible/site.yml +++ b/ansible/site.yml @@ -7,7 +7,7 @@ - repo: _ dport: container: alpine - tag: '3.11' + tag: '3.12' steps: - name: opnfv/xtesting containers: @@ -19,10 +19,10 @@ 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.11|arm64v8/alpine:3.11|g" {} + + -e "s|alpine:3.12|arm64v8/alpine:3.12|g" {} + elif [[ ${arch} == arm ]]; then 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" {} + fi (cd docker && docker build "${build_opts[@]}" \ -t "${repo}/${image}:${arch}-${tag}" .) diff --git a/docker/Dockerfile b/docker/Dockerfile index 7b908cd4..a5e3801e 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,9 +1,9 @@ -FROM alpine:3.11 +FROM alpine:3.12 ARG BRANCH=master ARG OPENSTACK_TAG=master -RUN apk --no-cache add --update python3 bash git mailcap && \ +RUN apk --no-cache add --update python3 py3-pip bash git mailcap && \ apk --no-cache add --virtual .build-deps --update \ python3-dev build-base && \ git init /src/functest-xtesting && \ |