From: Jérôme Benoit <jerome.benoit@sap.com>
Date: Thu, 3 Nov 2022 14:39:46 +0000 (+0100)
Subject: Merge branch 'main' into multiple-images
X-Git-Url: https://git.piment-noir.org/?a=commitdiff_plain;h=9528c4510aff71b3f064946446af3282dc0ec3f7;p=mbt-docker.git

Merge branch 'main' into multiple-images

Signed-off-by: Jérôme Benoit <jerome.benoit@sap.com>
---

9528c4510aff71b3f064946446af3282dc0ec3f7
diff --cc Dockerfile
index e8277c7,4b04645..b475c25
--- a/Dockerfile
+++ b/Dockerfile
@@@ -142,16 -147,23 +147,28 @@@ ENV M2_HOME ${MAVEN_HOME
  
  RUN set -ex \
    && apt-get update \
-   && apt-get install -y ca-certificates curl procps --no-install-recommends \
+   && apt-get install -y ca-certificates curl gnupg dirmngr --no-install-recommends \
    && rm -rf /var/lib/apt/lists/* \
+   && curl -fsSLO --compressed ${BASE_URL}/apache-maven-${MAVEN_VERSION}-bin.tar.gz \
+   && curl -fsSLO --compressed ${BASE_URL}/apache-maven-${MAVEN_VERSION}-bin.tar.gz.asc \
+   && for key in \
+     6A814B1F869C2BBEAB7CB7271A2A1C94BDE89688 \
+   ; do \
+     gpg --batch --keyserver hkps://pgp.surf.nl --recv-keys "$key" || \
+     gpg --batch --keyserver hkps://keyserver.ubuntu.com --recv-keys "$key" ; \
+   done \
+   && 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 \
-   && curl -fsSL -o /tmp/apache-maven.tar.gz ${BASE_URL}/apache-maven-${MAVEN_VERSION}-bin.tar.gz \
-   && echo "${SHA}  /tmp/apache-maven.tar.gz" | sha512sum -c - \
-   && tar -xzf /tmp/apache-maven.tar.gz -C ${MAVEN_HOME} --strip-components=1 \
-   && rm -f /tmp/apache-maven.tar.gz \
+   && tar -xzf apache-maven-${MAVEN_VERSION}-bin.tar.gz -C ${MAVEN_HOME} --strip-components=1 \
+   && rm -f apache-maven-${MAVEN_VERSION}-bin.tar.gz.asc apache-maven-${MAVEN_VERSION}-bin.tar.gz \
+   && chmod --recursive a+w ${MAVEN_HOME}/conf/* \
    && ln -s ${MAVEN_HOME}/bin/mvn /usr/bin/mvn \
++<<<<<<< HEAD
 +  && chmod --recursive a+w ${MAVEN_HOME}/conf/* \
 +  && apt-get remove --purge --autoremove -y ca-certificates curl \
++=======
+   && apt-get remove --purge --autoremove -y ca-certificates curl gnupg dirmngr \
++>>>>>>> main
    # smoke test
    && mvn --version
  
diff --cc docker-compose.yml
index 58e138e,e27e772..eed0c37
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@@ -5,66 -4,3 +5,66 @@@ services
      platform: linux/amd64
      build:
        dockerfile: Dockerfile
 +  mbt-node18-java11-docker:
 +    platform: linux/amd64
 +    build:
 +      args:
 +        NODE_VERSION: 18.12.0
 +        SAPMACHINE_VERSION: 11.0.16.1
 +      dockerfile: Dockerfile
 +  mbt-node16-java11-docker:
 +    platform: linux/amd64
 +    build:
 +      args:
 +        NODE_VERSION: 16.18.0
 +        SAPMACHINE_VERSION: 11.0.16.1
 +      dockerfile: Dockerfile
 +  mbt-node14-java11-docker:
 +    platform: linux/amd64
 +    build:
 +      args:
-         NODE_VERSION: 14.20.1
++        NODE_VERSION: 14.21.0
 +        SAPMACHINE_VERSION: 11.0.16.1
 +      dockerfile: Dockerfile
 +  mbt-node18-java17-docker:
 +    platform: linux/amd64
 +    build:
 +      args:
 +        NODE_VERSION: 18.12.0
 +        SAPMACHINE_VERSION: 17.0.4.1
 +      dockerfile: Dockerfile
 +  mbt-node16-java17-docker:
 +    platform: linux/amd64
 +    build:
 +      args:
 +        NODE_VERSION: 16.18.0
 +        SAPMACHINE_VERSION: 17.0.4.1
 +      dockerfile: Dockerfile
 +  mbt-node14-java17-docker:
 +    platform: linux/amd64
 +    build:
 +      args:
-         NODE_VERSION: 14.20.1
++        NODE_VERSION: 14.21.0
 +        SAPMACHINE_VERSION: 17.0.4.1
 +      dockerfile: Dockerfile
 +  mbt-node18-java19-docker:
 +    platform: linux/amd64
 +    build:
 +      args:
 +        NODE_VERSION: 18.12.0
 +        SAPMACHINE_VERSION: 19.0.1
 +      dockerfile: Dockerfile
 +  mbt-node16-java19-docker:
 +    platform: linux/amd64
 +    build:
 +      args:
 +        NODE_VERSION: 16.18.0
 +        SAPMACHINE_VERSION: 19.0.1
 +      dockerfile: Dockerfile
 +  mbt-node14-java19-docker:
 +    platform: linux/amd64
 +    build:
 +      args:
-         NODE_VERSION: 14.20.1
++        NODE_VERSION: 14.21.0
 +        SAPMACHINE_VERSION: 19.0.1
 +      dockerfile: Dockerfile