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

Set default branch to master

Also use GIT_REF instead of GIT_VERSION
parent cebf3263
No related branches found
No related tags found
No related merge requests found
RESTART=no RESTART=no
APP_DEBUG=false APP_DEBUG=false
DEV_PORT=5000 DEV_PORT=5000
GIT_VERSION=1-project-creation GIT_REF=master
...@@ -7,7 +7,6 @@ RUN apt-get update ...@@ -7,7 +7,6 @@ RUN apt-get update
FROM base As builder FROM base As builder
RUN apt-get install -y \ RUN apt-get install -y \
apache2 \
git \ git \
maven \ maven \
openjdk-11-jdk openjdk-11-jdk
...@@ -18,9 +17,10 @@ RUN git clone https://gitlab.tetras-libre.fr/unl/unl2rdf ...@@ -18,9 +17,10 @@ RUN git clone https://gitlab.tetras-libre.fr/unl/unl2rdf
WORKDIR /opt/unl2rdf WORKDIR /opt/unl2rdf
ARG GIT_VERSION=master ARG GIT_REF=master
RUN git checkout $GIT_VERSION RUN git pull
RUN git checkout $GIT_REF
RUN mvn package RUN mvn package
...@@ -43,7 +43,8 @@ RUN a2dissite 000-default ...@@ -43,7 +43,8 @@ RUN a2dissite 000-default
RUN a2ensite flask RUN a2ensite flask
COPY --from=builder /opt/unl2rdf/target/*.jar /opt/unl2rdf.jar COPY --from=builder /opt/unl2rdf/unl2rdf-app/target/unl2rdf-app-*-with-dependencies.jar /opt/unl2rdf.jar
#COPY --from=builder /opt/unl2rdf/Examples/exemples_unl.txt /opt/
# Force code reloading # Force code reloading
RUN sed -i 's/^\(\s*MaxConnectionsPerChild\s*\) 0/\1 1/g' /etc/apache2/mods-enabled/mpm_event.conf RUN sed -i 's/^\(\s*MaxConnectionsPerChild\s*\) 0/\1 1/g' /etc/apache2/mods-enabled/mpm_event.conf
......
...@@ -6,7 +6,7 @@ services: ...@@ -6,7 +6,7 @@ services:
build: build:
context: . context: .
args: args:
GIT_VERSION: ${GIT_VERSION} GIT_REF: ${GIT_REF}
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