Skip to content
Snippets Groups Projects
Verified Commit 34334c46 authored by David Beniamine's avatar David Beniamine
Browse files

Update build process

Fix #11
parent 104d4c53
No related branches found
No related tags found
No related merge requests found
...@@ -19,19 +19,11 @@ WORKDIR /opt ...@@ -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/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 WORKDIR /opt/unlTools
ARG GIT_REF=master 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 FROM base
...@@ -44,7 +36,7 @@ RUN apt-get install -y \ ...@@ -44,7 +36,7 @@ RUN apt-get install -y \
python3-pip python3-pip
RUN pip3 install flask RUN pip3 install flask requests
COPY flask.conf /etc/apache2/sites-available COPY flask.conf /etc/apache2/sites-available
...@@ -59,6 +51,6 @@ WORKDIR /var/www/app/app ...@@ -59,6 +51,6 @@ WORKDIR /var/www/app/app
COPY entrypoint.sh / 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"] ENTRYPOINT ["/entrypoint.sh"]
...@@ -7,7 +7,6 @@ services: ...@@ -7,7 +7,6 @@ services:
context: . context: .
args: args:
GIT_REF: GIT_REF:
GIT_REF_VOCABULARY:
volumes: volumes:
- "./src:/var/www/app" - "./src:/var/www/app"
environment: environment:
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment