Bump MBT version to 1.2.21

[mbt-docker.git] / Dockerfile

diff --git a/Dockerfile b/Dockerfile
index 338d6387c92a72083a2db36b1a6c109338b188d4..200723cbaee62a0cb9b2a8ac8cfec99c77be7fbc 100644 (file)
--- a/Dockerfile
+++ b/Dockerfile
@@ -113,7 +113,10 @@ RUN set -ex \
 
 ARG SAPMACHINE_VERSION=11.0.17
 
-RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \
+ENV JAVA_HOME /opt/jdk
+
+RUN ARCH=; SAPMACHINE_MAJOR_VERSION=$(echo ${SAPMACHINE_VERSION} | cut -d. -f1) \
+    && dpkgArch="$(dpkg --print-architecture)" \
     && case "${dpkgArch##*-}" in \
       amd64) ARCH='amd64';; \
       *) echo "unsupported architecture"; exit 1 ;; \
@@ -132,11 +135,12 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \
   && chmod 644 /etc/apt/trusted.gpg.d/sapmachine.gpg \
   && 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 \
+  && apt-get install -y sapmachine-${SAPMACHINE_MAJOR_VERSION}-jdk=${SAPMACHINE_VERSION} --no-install-recommends \
   && rm -rf "$GNUPGHOME" /var/lib/apt/lists/* \
   && apt-get remove --purge --autoremove -y ca-certificates gnupg dirmngr \
+  && ln -s /usr/lib/jvm/sapmachine-${SAPMACHINE_MAJOR_VERSION} ${JAVA_HOME} \
   # smoke test
-  && java --version
+  && java -version
 
 ARG MAVEN_VERSION=3.8.6
 ARG BASE_URL=https://downloads.apache.org/maven/maven-3/${MAVEN_VERSION}/binaries
@@ -160,17 +164,17 @@ RUN set -ex \
   && gpg --batch --verify apache-maven-${MAVEN_VERSION}-bin.tar.gz.asc apache-maven-${MAVEN_VERSION}-bin.tar.gz \
   && mkdir -p ${MAVEN_HOME} ${MAVEN_HOME}/ref \
   && tar -xzf apache-maven-${MAVEN_VERSION}-bin.tar.gz -C ${MAVEN_HOME} --strip-components=1 \
-  && rm -rf  "$GNUPGHOME" apache-maven-${MAVEN_VERSION}-bin.tar.gz.asc apache-maven-${MAVEN_VERSION}-bin.tar.gz \
+  && rm -rf "$GNUPGHOME" apache-maven-${MAVEN_VERSION}-bin.tar.gz.asc apache-maven-${MAVEN_VERSION}-bin.tar.gz \
   && chmod -R a+w ${MAVEN_HOME}/conf/* \
   && ln -s ${MAVEN_HOME}/bin/mvn /usr/bin/mvn \
   && apt-get remove --purge --autoremove -y ca-certificates curl gnupg dirmngr \
   # smoke test
   && mvn --version
 
-ARG MBT_VERSION=1.2.19
+ARG MBT_VERSION=1.2.21
 
 RUN set -ex \
-  && npm install -g --unsafe-perm mbt@${MBT_VERSION} \
+  && npm install -g --registry=https://int.repositories.cloud.sap/artifactory/api/npm/build-releases-npm --unsafe-perm mbt@${MBT_VERSION} \
   && npm cache clean -g --force \
   # smoke test
   && mbt --version