X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=Dockerfile;h=5be6ec411f7b673f670f7343af8a57c2073b9f47;hb=74ad74b2ec0700c171ce88aaa408926b44d609ca;hp=a31c6836f2ae684ef33b91c627e685f4c8b6f1f1;hpb=8c37d866ed2eb9919901f5db84c49e4afe74d38d;p=mbt-docker.git

diff --git a/Dockerfile b/Dockerfile
index a31c683..5be6ec4 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -113,22 +113,21 @@ RUN set -ex \
 
 ARG SAPMACHINE_VERSION=11.0.16.1
 
-RUN set -ex \
+RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \
+    && case "${dpkgArch##*-}" in \
+      amd64) ARCH='amd64';; \
+      *) echo "unsupported architecture"; exit 1 ;; \
+    esac \
+  && set -ex \
   && apt-get update \
-  && apt-get install -y gnupg dirmngr --no-install-recommends \
+  && apt-get install -y ca-certificates wget --no-install-recommends \
   && rm -rf /var/lib/apt/lists/* \
-  && for key in \
-    CACB9FE09150307D1D22D82962754C3B3ABCFE23 \
-  ; do \
-    gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \
-    gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "$key" ; \
-    gpg --batch --export --armor "$key" | tee /etc/apt/trusted.gpg.d/sapmachine-${key}.gpg.asc; \
-  done \
-  && echo "deb http://dist.sapmachine.io/debian/amd64/ ./" | tee /etc/apt/sources.list.d/sapmachine.list \
+  && wget -q -O - https://dist.sapmachine.io/debian/sapmachine.key | tee /etc/apt/trusted.gpg.d/sapmachine.gpg.asc \
+  && echo "deb http://dist.sapmachine.io/debian/${ARCH}/ ./" | tee /etc/apt/sources.list.d/sapmachine.list \
   && apt-get update \
   && apt-get install -y sapmachine-$(echo ${SAPMACHINE_VERSION} | cut -d. -f1)-jdk=${SAPMACHINE_VERSION} --no-install-recommends \
   && rm -rf /var/lib/apt/lists/* \
-  && apt-get remove --purge --autoremove -y gnupg dirmngr \
+  && apt-get remove --purge --autoremove -y ca-certificates wget \
   # smoke test
   && java --version
 
@@ -150,7 +149,7 @@ RUN set -ex \
   && rm -f /tmp/apache-maven.tar.gz \
   && ln -s ${MAVEN_HOME}/bin/mvn /usr/bin/mvn \
   && chmod --recursive a+w "${MAVEN_HOME}"/conf/* \
-  && apt-get remove --purge --autoremove -y curl \
+  && apt-get remove --purge --autoremove -y ca-certificates curl \
   # smoke test
   && mvn --version
 
@@ -164,7 +163,7 @@ RUN set -ex \
 # SAP e-Mobility requirements
 RUN set -ex \
   && apt-get update \
-  && apt-get install -y build-essential python3 --no-install-recommends \
+  && apt-get install -y ca-certificates build-essential python3 --no-install-recommends \
   && rm -rf /var/lib/apt/lists/* \
   # smoke test
   && python3 --version