X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=Dockerfile;h=f84174dca73273188619389dd739cfbcf9c62139;hb=3206fa6381af166dcd94245315ba3300c5db5e4d;hp=dcb4c74cd1dd6661d7eadad969aa74329aa0383e;hpb=45636150db8c1d6b92108e56b8e216b508c63f28;p=mbt-docker.git

diff --git a/Dockerfile b/Dockerfile
index dcb4c74..f84174d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -24,7 +24,7 @@ RUN set -ex \
 ADD http://aia.pki.co.sap.com/aia/SAP%20Global%20Root%20CA.crt \
     /etc/ssl/certs/SAP_Global_Root_CA.crt
 
-ARG NODE_VERSION=16.18.1
+ARG NODE_VERSION=16.19.0
 
 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \
     && case "${dpkgArch##*-}" in \
@@ -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,13 +135,14 @@ 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
 
-ARG MAVEN_VERSION=3.8.6
+ARG MAVEN_VERSION=3.8.7
 ARG BASE_URL=https://downloads.apache.org/maven/maven-3/${MAVEN_VERSION}/binaries
 
 ENV MAVEN_HOME /usr/share/maven
@@ -167,7 +171,7 @@ RUN set -ex \
   # smoke test
   && mvn --version
 
-ARG MBT_VERSION=1.2.20
+ARG MBT_VERSION=1.2.23
 
 RUN set -ex \
   && npm install -g --registry=https://int.repositories.cloud.sap/artifactory/api/npm/build-releases-npm --unsafe-perm mbt@${MBT_VERSION} \
@@ -183,5 +187,12 @@ RUN set -ex \
   # smoke test
   && python3 --version
 
+# Allow global npm packages install without sudo
+RUN set -ex \
+  && mkdir ${USER_HOME_DIR}/.npm-global \
+  && mkdir ${USER_HOME_DIR}/.npm-global/lib \
+  && chown -R ${USER}:${USER} ${USER_HOME_DIR}
+ENV NPM_CONFIG_PREFIX ${USER_HOME_DIR}/.npm-global
+
 WORKDIR /project
 USER ${USER}