Merge branch 'main' of git.piment-noir.org:mbt-docker
authorJérôme Benoit <jerome.benoit@sap.com>
Wed, 2 Aug 2023 13:53:36 +0000 (15:53 +0200)
committerJérôme Benoit <jerome.benoit@sap.com>
Wed, 2 Aug 2023 13:53:36 +0000 (15:53 +0200)
Signed-off-by: Jérôme Benoit <jerome.benoit@sap.com>
1  2 
Dockerfile

diff --combined Dockerfile
index 7bcd08094c9a09ad94b94c06a29fdfe4585d7648,9ca24f4a7b036b89903dffda711d95c11db7daaa..b626894a1a922adc6a866d1066e368568ea4fe9a
@@@ -52,6 -52,7 +52,7 @@@ RUN ARCH= && dpkgArch="$(dpkg --print-a
        890C08DB8579162FEE0DF9DB8BEAB4DFCF555EF4 \
        C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \
        108F52B48DB57BB0CC439B2997B01419BD92F80A \
+       DD792F5973C6DE52C432CBDAC77ABFA00DDBF2B7 \
      ; do \
        gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \
        gpg --batch --keyserver hkps://keyserver.ubuntu.com --recv-keys "$key" ; \
@@@ -111,7 -112,7 +112,7 @@@ RUN set -ex 
    # smoke test
    && yarn --version
  
 -ARG SAPMACHINE_VERSION=11.0.19
 +ARG SAPMACHINE_VERSION=11.0.20
  
  ENV JAVA_HOME /opt/jdk
  
@@@ -197,7 -198,7 +198,7 @@@ RUN set -ex 
    # smoke test
    && mvn --version
  
 -ARG MBT_VERSION=1.2.23
 +ARG MBT_VERSION=1.2.24
  
  RUN set -ex \
    && npm install -g --unsafe-perm mbt@${MBT_VERSION} \