From 9f5f67619b5f1d5cd4b91a296faa0757ff0bbba1 Mon Sep 17 00:00:00 2001
From: David Beniamine <david.beniamine@tetras-libre.fr>
Date: Mon, 25 May 2020 10:55:03 +0200
Subject: [PATCH] Compile rdf-vocabulary
Fix #9
---
.env.sample | 1 +
Dockerfile | 20 +++++++++++++-------
docker-compose.yml | 3 ++-
3 files changed, 16 insertions(+), 8 deletions(-)
diff --git a/.env.sample b/.env.sample
index e31c215..c1c5f61 100644
--- a/.env.sample
+++ b/.env.sample
@@ -2,3 +2,4 @@ RESTART=no
APP_DEBUG=false
DEV_PORT=5000
GIT_REF=master
+GIT_REF_VOCABULARY=master
diff --git a/Dockerfile b/Dockerfile
index f59c658..9b41dd5 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -16,16 +16,22 @@ RUN apt-get install -y \
WORKDIR /opt
-RUN git clone https://gitlab.tetras-libre.fr/unl/unl2rdf
-WORKDIR /opt/unl2rdf
+RUN git clone https://gitlab.tetras-libre.fr/unl/unlTools
-ARG GIT_REF=master
+RUN git clone https://gitlab.tetras-libre.fr/unl/rdf-vocabulary
+
+WORKDIR /opt/rdf-vocabulary
+
+ARG GIT_REF_VOCABULARY=master
-RUN git pull
-RUN git checkout $GIT_REF
+RUN git pull && git checkout $GIT_REF_VOCABULARY && mvn install
+
+WORKDIR /opt/unlTools
+
+ARG GIT_REF=master
-RUN mvn package
+RUN git pull && git checkout $GIT_REF && mvn package
FROM base
@@ -46,7 +52,7 @@ RUN a2dissite 000-default
RUN a2ensite flask
-COPY --from=builder /opt/unl2rdf/unl2rdf-app/target/unl2rdf-app-*-with-dependencies.jar /opt/unl2rdf.jar
+COPY --from=builder /opt/unlTools/unl2rdf-app/target/unl2rdf-app-*-with-dependencies.jar /opt/unl2rdf.jar
# Force code reloading
RUN sed -i 's/^\(\s*MaxConnectionsPerChild\s*\) 0/\1 1/g' /etc/apache2/mods-enabled/mpm_event.conf
diff --git a/docker-compose.yml b/docker-compose.yml
index 6fc2d36..63090bf 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -6,7 +6,8 @@ services:
build:
context: .
args:
- GIT_REF: ${GIT_REF}
+ GIT_REF:
+ GIT_REF_VOCABULARY:
volumes:
- "./src:/var/www/app"
environment:
--
GitLab