Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
web-service-demo
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container registry
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
UNL
web-service-demo
Commits
84ee6867
Verified
Commit
84ee6867
authored
5 years ago
by
David Beniamine
Browse files
Options
Downloads
Patches
Plain Diff
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
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
.env.sample
+1
-1
1 addition, 1 deletion
.env.sample
Dockerfile
+5
-4
5 additions, 4 deletions
Dockerfile
docker-compose.yml
+1
-1
1 addition, 1 deletion
docker-compose.yml
with
7 additions
and
6 deletions
.env.sample
+
1
−
1
View file @
84ee6867
RESTART=no
RESTART=no
APP_DEBUG=false
APP_DEBUG=false
DEV_PORT=5000
DEV_PORT=5000
GIT_
VERSION=1-project-creation
GIT_
REF=master
This diff is collapsed.
Click to expand it.
Dockerfile
+
5
−
4
View file @
84ee6867
...
@@ -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
...
...
This diff is collapsed.
Click to expand it.
docker-compose.yml
+
1
−
1
View file @
84ee6867
...
@@ -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
:
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment