From 34334c46ec03cd8854847a4393cf2ff94c574a5e Mon Sep 17 00:00:00 2001
From: David Beniamine <david.beniamine@tetras-libre.fr>
Date: Mon, 29 Jun 2020 10:01:37 +0200
Subject: [PATCH] Update build process
Fix #11
---
Dockerfile | 14 +++-----------
docker-compose.yml | 1 -
2 files changed, 3 insertions(+), 12 deletions(-)
diff --git a/Dockerfile b/Dockerfile
index f959161..7ed5b3c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -19,19 +19,11 @@ WORKDIR /opt
RUN git clone https://gitlab.tetras-libre.fr/unl/unlTools
-RUN git clone https://gitlab.tetras-libre.fr/unl/rdf-vocabulary
-
-WORKDIR /opt/rdf-vocabulary
-
-ARG GIT_REF_VOCABULARY=master
-
-RUN git pull && git checkout $GIT_REF_VOCABULARY && mvn install
-
WORKDIR /opt/unlTools
ARG GIT_REF=master
-RUN git pull && git checkout $GIT_REF && mvn package
+RUN git pull && git checkout $GIT_REF && bash Scripts/createOrUpdateLocalTetrasArtifactsRepository.sh && mvn package
FROM base
@@ -44,7 +36,7 @@ RUN apt-get install -y \
python3-pip
-RUN pip3 install flask
+RUN pip3 install flask requests
COPY flask.conf /etc/apache2/sites-available
@@ -59,6 +51,6 @@ WORKDIR /var/www/app/app
COPY entrypoint.sh /
-COPY --from=builder /opt/unlTools/unl2rdf-app/target/unl2rdf-app-*-with-dependencies.jar /opt/unl2rdf.jar
+COPY --from=builder /opt/unlTools/unl2rdf-app/target/unl2rdf-app-*.jar /opt/unl2rdf.jar
ENTRYPOINT ["/entrypoint.sh"]
diff --git a/docker-compose.yml b/docker-compose.yml
index 63090bf..5a6109b 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -7,7 +7,6 @@ services:
context: .
args:
GIT_REF:
- GIT_REF_VOCABULARY:
volumes:
- "./src:/var/www/app"
environment:
--
GitLab