Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
V
vlkb-soda
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
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
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
ViaLactea
vlkb-soda
Commits
8f5126ac
Commit
8f5126ac
authored
1 year ago
by
Robert Butora
Browse files
Options
Downloads
Patches
Plain Diff
docker: changes proj name vlkb-cutout -> vlkb-soda
parent
57d6b4a1
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
docker/Dockerfile
+4
-4
4 additions, 4 deletions
docker/Dockerfile
docker/Makefile
+2
-2
2 additions, 2 deletions
docker/Makefile
with
6 additions
and
6 deletions
docker/Dockerfile
+
4
−
4
View file @
8f5126ac
...
...
@@ -17,7 +17,7 @@ ENV CATALINA_BASE=/var/lib/tomcat9
ENV
CATALINA_HOME=/usr/share/tomcat9
ENV
CATALINA_TMPDIR=/tmp
ENV
WEBAPP_DIR=/webapps/vlkb-
cutout
ENV
WEBAPP_DIR=/webapps/vlkb-
soda
COPY
deps/ast_9.2.9-1_amd64.deb ./
RUN
dpkg
-i
/root/ast_9.2.9-1_amd64.deb
&&
ldconfig
\
...
...
@@ -29,11 +29,11 @@ RUN dpkg -i /root/ast_9.2.9-1_amd64.deb && ldconfig \
ARG
VLKB_VERSION
COPY
vlkb-${VLKB_VERSION}.deb vlkb-obscore-${VLKB_VERSION}.deb vlkbd-${VLKB_VERSION}.deb ./
COPY
vlkb-
cutout
-${VLKB_VERSION}.war ${WEBAPP_DIR}/
COPY
vlkb-
soda
-${VLKB_VERSION}.war ${WEBAPP_DIR}/
RUN
dpkg
-i
vlkb-
${
VLKB_VERSION
}
.deb vlkb-obscore-
${
VLKB_VERSION
}
.deb vlkbd-
${
VLKB_VERSION
}
.deb
\
&&
cd
${
WEBAPP_DIR
}
&&
jar
-xf
vlkb-
cutout
-
${
VLKB_VERSION
}
.war
&&
cd
${
WEBAPP_DIR
}
&&
jar
-xf
vlkb-
soda
-
${
VLKB_VERSION
}
.war
# Tomcat must load DB-driver (postgresql_*.jar), vlkb-
cutout
does not explicitely load DB-drivers
# Tomcat must load DB-driver (postgresql_*.jar), vlkb-
soda
does not explicitely load DB-drivers
COPY
deps/postgresql-*.jar /var/lib/tomcat9/lib
...
...
This diff is collapsed.
Click to expand it.
docker/Makefile
+
2
−
2
View file @
8f5126ac
...
...
@@ -5,9 +5,9 @@ VERSION ?= $(shell git describe)
all
:
download-all
:
vlkb-
cutout
vlkbd vlkb-obscore vlkb
download-all
:
vlkb-
soda
vlkbd vlkb-obscore vlkb
vlkb-
cutout
:
vlkb-
soda
:
make download
PACK_FILE
=
$@
-
$(
VERSION
)
.war
vlkbd vlkb-obscore vlkb
:
...
...
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