diff --git a/Dockerfile b/Dockerfile index f9591616b7c22bf6f648f3a2e0e4c5e6a24c3c4a..7ed5b3c6bb6b3cd24a04c623b35683b7d2f85de3 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 63090bff894c5dc632d20f4aba9cd5883fb08363..5a6109b0ea4dfc639b0175a2a300b74ecd158a2c 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: