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
34334c46
Verified
Commit
34334c46
authored
4 years ago
by
David Beniamine
Browse files
Options
Downloads
Patches
Plain Diff
Update build process
Fix
#11
parent
104d4c53
No related branches found
No related tags found
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
Dockerfile
+3
-11
3 additions, 11 deletions
Dockerfile
docker-compose.yml
+0
-1
0 additions, 1 deletion
docker-compose.yml
with
3 additions
and
12 deletions
Dockerfile
+
3
−
11
View file @
34334c46
...
@@ -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"]
This diff is collapsed.
Click to expand it.
docker-compose.yml
+
0
−
1
View file @
34334c46
...
@@ -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
:
...
...
This diff is collapsed.
Click to expand it.
Sebastien
@Sebastien
mentioned in issue
#14
·
4 years ago
mentioned in issue
#14
mentioned in issue #14
Toggle commit list
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