From 03230f60a9601cc7177d19c8239a101395d1c0b7 Mon Sep 17 00:00:00 2001
From: Escalante Martinez <Marisa.Escalante@tecnalia.com>
Date: Thu, 29 Nov 2018 15:29:10 +0100
Subject: [PATCH] Added OPTIMUS M24
---
.../src/main/docker/Dockerfile | 6 +++---
.../src/main/docker/downloadsources.sh | 11 +++++------
.../src/main/docker/maveninstall.sh | 4 ++--
3 files changed, 10 insertions(+), 11 deletions(-)
diff --git a/OPTIMUS/eu.decideh2020.int.optimus.server.src.dvp/src/main/docker/Dockerfile b/OPTIMUS/eu.decideh2020.int.optimus.server.src.dvp/src/main/docker/Dockerfile
index 6d96947a..8eadc7bc 100644
--- a/OPTIMUS/eu.decideh2020.int.optimus.server.src.dvp/src/main/docker/Dockerfile
+++ b/OPTIMUS/eu.decideh2020.int.optimus.server.src.dvp/src/main/docker/Dockerfile
@@ -5,8 +5,8 @@ FROM maven:3.5.3-jdk-8 as builder
#COPY .m2 /root/.m2
#
ARG GIT_CREDENTIALS
-ARG APPMANAGER_VERSION
-ARG ACSMI_VERSION
+ARG APPMANAGER_VERSION=4a0ea6cefb05af77565ffbdb6fa5b29e695860ec
+ARG OPTIMUS_VERSION=3ff6333b5d90743014fed475707d505e6f02f3d7
COPY downloadsources.sh /downloadsources.sh
COPY maveninstall.sh /maveninstall.sh
@@ -15,6 +15,6 @@ RUN chmod +x /downloadsources.sh && \
chmod +x /maveninstall.sh && \
sh ./maveninstall.sh
-WORKDIR /WP3/Optimus/eu.decideh2020.optimus.server
+WORKDIR /OPTIMUS/eu.decideh2020.optimus.server
CMD ["mvn","jetty:run","-Dmaven.test.skip=true"]
#cd target/*.war /ROOT.war
\ No newline at end of file
diff --git a/OPTIMUS/eu.decideh2020.int.optimus.server.src.dvp/src/main/docker/downloadsources.sh b/OPTIMUS/eu.decideh2020.int.optimus.server.src.dvp/src/main/docker/downloadsources.sh
index f0ea56ab..6e75dd73 100644
--- a/OPTIMUS/eu.decideh2020.int.optimus.server.src.dvp/src/main/docker/downloadsources.sh
+++ b/OPTIMUS/eu.decideh2020.int.optimus.server.src.dvp/src/main/docker/downloadsources.sh
@@ -1,10 +1,9 @@
cd /
-git clone https://$GIT_CREDENTIALS@git.code.tecnalia.com/decide/AppController.git
+git clone https://git.code.tecnalia.com/DECIDE_Public/DECIDE_Components.git AppController
cd /AppController
git checkout $APPMANAGER_VERSION
cd /
-git clone https://$GIT_CREDENTIALS@git.code.tecnalia.com/decide/WP5.git
-cd /WP5
-git checkout $ACSMI_VERSION
-cd /
-git clone https://$GIT_CREDENTIALS@git.code.tecnalia.com/decide/WP3.git
+git clone https://git.code.tecnalia.com/DECIDE_Public/DECIDE_Components.git OPTIMUS
+cd /OPTIMUS
+git checkout $OPTIMUS_VERSION
+
diff --git a/OPTIMUS/eu.decideh2020.int.optimus.server.src.dvp/src/main/docker/maveninstall.sh b/OPTIMUS/eu.decideh2020.int.optimus.server.src.dvp/src/main/docker/maveninstall.sh
index b72cd51d..9947115f 100644
--- a/OPTIMUS/eu.decideh2020.int.optimus.server.src.dvp/src/main/docker/maveninstall.sh
+++ b/OPTIMUS/eu.decideh2020.int.optimus.server.src.dvp/src/main/docker/maveninstall.sh
@@ -1,6 +1,6 @@
cd /AppController
mvn install -Dmaven.test.skip=true
-cd /WP5/ACSmI_discovery/eu.decideh2020.acsmi.backend.services.client
+cd /OPTIMUS/ACSmI-client
mvn install -Dmaven.test.skip=true
-cd /WP3/Optimus/eu.decideh2020.optimus.server
+cd /OPTIMUS/eu.decideh2020.optimus.server
mvn install -Dmaven.test.skip=true
--
GitLab