X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=docker%2Fcore%2FDockerfile;h=6cddfcb76ecfe4f42d654462b7bd5b6dc20aad24;hb=6801612e85c485e9885cfb41cbc84771475a134f;hp=9d286bb71123703a95bef8589ff6b044182a5950;hpb=f5d06afcc5b361c479892839722ce276ed245198;p=functest-kubernetes.git

diff --git a/docker/core/Dockerfile b/docker/core/Dockerfile
index 9d286bb7..6cddfcb7 100644
--- a/docker/core/Dockerfile
+++ b/docker/core/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.14-alpine3.12
+FROM golang:1.15-alpine3.12
 
 ARG BRANCH=master
 ARG OPENSTACK_TAG=master
@@ -9,12 +9,15 @@ COPY Switch-to-threading.Thread-for-Rally-tasks.patch /tmp/Switch-to-threading.T
 RUN apk --no-cache add --update python3 py3-pip py3-wheel bash git grep libffi openssl mailcap && \
     apk --no-cache add --virtual .build-deps --update \
         python3-dev build-base libffi-dev openssl-dev && \
-    apk --no-cache add --update --upgrade py3-distlib \
-        --repository=http://dl-cdn.alpinelinux.org/alpine/edge/main && \
     git init /src/requirements && \
     (cd /src/requirements && \
         git fetch --tags https://review.opendev.org/openstack/requirements $OPENSTACK_TAG && \
         git checkout FETCH_HEAD) && \
+    case $(uname -m) in aarch*|arm*) \
+        sed -i -E /^PyNaCl=/d /src/requirements/upper-constraints.txt && \
+        apk add --no-cache py3-pynacl ;; esac && \
+    apk --no-cache add --update py3-distlib\>=0.3.1 \
+        --repository=http://dl-cdn.alpinelinux.org/alpine/edge/main && \
     git init /src/functest-kubernetes && \
     (cd /src/functest-kubernetes && \
         git fetch --tags https://gerrit.opnfv.org/gerrit/functest-kubernetes $BRANCH && \