X-Git-Url: https://gerrit.akraino.org/r/gitweb?a=blobdiff_plain;f=docker-build%2Fflannel%2FDockerfile;h=5dd12d6483a2b39b105c16ed72aceec10ab34432;hb=531bfda510814db14e51cf3db82330d67f6fbb37;hp=f447bdb42ac574ec326911711175484dde3494c9;hpb=8e53059aed6a7fdde34149893f05552aca3ed89a;p=ta%2Fcaas-danm.git diff --git a/docker-build/flannel/Dockerfile b/docker-build/flannel/Dockerfile index f447bdb..5dd12d6 100644 --- a/docker-build/flannel/Dockerfile +++ b/docker-build/flannel/Dockerfile @@ -1,11 +1,11 @@ # Copyright 2019 Nokia -# +# # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at -# +# # http://www.apache.org/licenses/LICENSE-2.0 -# +# # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -17,14 +17,13 @@ MAINTAINER Levente Kale ARG FLANNEL ENV FLANNEL_VERSION=$FLANNEL -ARG FLANNEL_ARCHITECTURE -ENV FLANNEL_ARCH=$FLANNEL_ARCHITECTURE RUN apk add --no-cache wget iproute2 net-tools ca-certificates iptables strongswan && update-ca-certificates && \ - apk add wireguard-tools --no-cache --repository http://dl-cdn.alpinelinux.org/alpine/edge/testing + apk add wireguard-tools --no-cache --repository http://dl-cdn.alpinelinux.org/alpine/edge/community -RUN mkdir -p /opt/bin && \ - wget -O /opt/bin/flanneld https://github.com/coreos/flannel/releases/download/v${FLANNEL_VERSION}/flanneld-${FLANNEL_ARCH} && \ +RUN mkdir -p /opt/bin && \ + if [ $(uname -m) == 'aarch64' ]; then HOST_ARCH=arm64; else HOST_ARCH=amd64; fi && \ + wget -O /opt/bin/flanneld https://github.com/coreos/flannel/releases/download/v${FLANNEL_VERSION}/flanneld-${HOST_ARCH} && \ chmod +x /opt/bin/flanneld && \ wget -O /opt/bin/mk-docker-opts.sh https://github.com/coreos/flannel/blob/v${FLANNEL_VERSION}/dist/mk-docker-opts.sh