X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=Dockerfile;h=2303b469cb019d982d397bfffd7559b395b215f3;hb=d26e5bd4ddb9d0adb2bbc0323e01ca2232d1ff9c;hp=6635664fb8d14e6db5c8fd0ae877530b930225e9;hpb=28df4c45ae73bd91f83ffc99fadc12a24175b99a;p=mbt-docker.git

diff --git a/Dockerfile b/Dockerfile
index 6635664..2303b46 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 \
@@ -111,9 +111,12 @@ RUN set -ex \
   # smoke test
   && yarn --version
 
-ARG SAPMACHINE_VERSION=11.0.17
+ARG SAPMACHINE_VERSION=11.0.18
+
+ENV JAVA_HOME /opt/jdk
 
 RUN sapmachine_install() { \
+    SAPMACHINE_MAJOR_VERSION=$(echo ${SAPMACHINE_VERSION} | cut -d. -f1); \
     ARCH=; \
     dpkgArch="$(dpkg --print-architecture)"; \
     case "${dpkgArch##*-}" in \
@@ -133,9 +136,10 @@ RUN sapmachine_install() { \
     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}; \
   }; \
   sapjvm_install() { \
     ARCH=; \
@@ -150,9 +154,10 @@ RUN sapmachine_install() { \
     rm -rf /var/lib/apt/lists/*; \
     curl -fsSLO --compressed -b 'eula_3_1_agreed=tools.hana.ondemand.com/developer-license-3_1.txt' https://tools.hana.ondemand.com/additional/sapjvm-${SAPMACHINE_VERSION}-linux-${ARCH}.zip; \
     echo "583dedfeee0c119839a610ddc8c6768d0c044429  sapjvm-${SAPMACHINE_VERSION}-linux-${ARCH}.zip" | sha1sum -c -; \
-    bsdtar xvf sapjvm-${SAPMACHINE_VERSION}-linux-${ARCH}.zip -C /usr/local --strip-components=1; \
+    bsdtar -xvf sapjvm-${SAPMACHINE_VERSION}-linux-${ARCH}.zip -C /usr/local --strip-components=1 --no-same-owner; \
     rm -f sapjvm-${SAPMACHINE_VERSION}-linux-${ARCH}.zip; \
     apt-get remove --purge --auto-remove -y ca-certificates curl libarchive-tools; \
+    ln -s /usr/local ${JAVA_HOME}; \
   } \
   && set -ex \
   && if [ $(echo ${SAPMACHINE_VERSION} | cut -d. -f1) -le 8 ]; then \
@@ -161,9 +166,9 @@ RUN sapmachine_install() { \
       sapmachine_install; \
     fi \
   # smoke test
-  && java -version;
+  && java -version
 
-ARG MAVEN_VERSION=3.8.6
+ARG MAVEN_VERSION=3.9.0
 ARG BASE_URL=https://downloads.apache.org/maven/maven-3/${MAVEN_VERSION}/binaries
 
 ENV MAVEN_HOME /usr/share/maven
@@ -177,7 +182,7 @@ RUN set -ex \
   && curl -fsSLO --compressed ${BASE_URL}/apache-maven-${MAVEN_VERSION}-bin.tar.gz.asc \
   && export GNUPGHOME="$(mktemp -d)" \
   && for key in \
-    6A814B1F869C2BBEAB7CB7271A2A1C94BDE89688 \
+    29BEA2A645F2D6CED7FB12E02B172E3E156466E8 \
   ; do \
     gpg --batch --keyserver hkps://pgp.surf.nl --recv-keys "$key" || \
     gpg --batch --keyserver hkps://keyserver.ubuntu.com --recv-keys "$key" ; \
@@ -192,7 +197,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} \
@@ -208,5 +213,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}