From: Jérôme Benoit <jerome.benoit@sap.com>
Date: Thu, 3 Nov 2022 14:41:59 +0000 (+0100)
Subject: Merge branch 'multiple-images' of https://github.tools.sap/E-Mobility/mbt-docker... 
X-Git-Url: https://git.piment-noir.org/?a=commitdiff_plain;h=8c44ff7112d929f6d0f8bd0357071327c41dd325;hp=9528c4510aff71b3f064946446af3282dc0ec3f7;p=mbt-docker.git

Merge branch 'multiple-images' of https://github.tools.sap/E-Mobility/mbt-docker into multiple-images

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

diff --git a/Dockerfile b/Dockerfile
index b475c25..4b04645 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -163,12 +163,7 @@ RUN set -ex \
   && 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