From 386727ebc6bbb764e2bbb46129c8f131a774d3c0 Mon Sep 17 00:00:00 2001
From: Norman Maurer <norman_maurer@apple.com>
Date: Sun, 20 Dec 2020 14:21:29 +0100
Subject: [PATCH] Always use the mvn installation of the image (#118)

Motivation:

Let's use always the mvn installation which is part of the image to minimize things that needs to be fetched

Modifications:

Use mvn directly

Result:

Less downloads during build
---
 docker/Dockerfile.centos6           | 1 +
 docker/docker-compose.centos-6.yaml | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/docker/Dockerfile.centos6 b/docker/Dockerfile.centos6
index fc6da479f..04132c4f6 100644
--- a/docker/Dockerfile.centos6
+++ b/docker/Dockerfile.centos6
@@ -66,6 +66,7 @@ RUN echo 'PATH=$PATH:$HOME/.cargo/bin' >> ~/.bashrc
 
 WORKDIR /opt
 RUN curl https://downloads.apache.org/maven/maven-3/3.6.3/binaries/apache-maven-3.6.3-bin.tar.gz | tar -xz
+RUN echo 'PATH=/opt/apache-maven-3.6.3/bin/:$PATH' >> ~/.bashrc
 
 # Prepare our own build
 ENV PATH /opt/apache-maven-3.6.3/bin/:$PATH
diff --git a/docker/docker-compose.centos-6.yaml b/docker/docker-compose.centos-6.yaml
index 27cc27189..03320d8cb 100644
--- a/docker/docker-compose.centos-6.yaml
+++ b/docker/docker-compose.centos-6.yaml
@@ -23,13 +23,13 @@ services:
 
   build-clean:
     <<: *common
-    command: /bin/bash -cl "./mvnw clean package"
+    command: /bin/bash -cl "mvn clean package"
 
   shell:
     <<: *common
     environment:
-      - SANOTYPE_USER
-      - SANOTYPE_PASSWORD
+      - SONATYPE_USER
+      - SONATYPE_PASSWORD
     volumes:
       - ~/.ssh:/root/.ssh:delegated
       - ~/.gnupg:/root/.gnupg:delegated