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
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
ViaLactea
vlkb-soda
Commits
ced498fe
Commit
ced498fe
authored
11 months ago
by
Robert Butora
Browse files
Options
Downloads
Patches
Plain Diff
docker: re-orders Dockerfile cmds for quiecker re-build after war/deb-update
parent
d915df49
No related branches found
No related tags found
No related merge requests found
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
docker/Dockerfile.soda
+17
-16
17 additions, 16 deletions
docker/Dockerfile.soda
with
17 additions
and
16 deletions
docker/Dockerfile.soda
+
17
−
16
View file @
ced498fe
...
@@ -14,6 +14,21 @@ ENV CATALINA_HOME=/usr/local/tomcat
...
@@ -14,6 +14,21 @@ ENV CATALINA_HOME=/usr/local/tomcat
WORKDIR
/root
WORKDIR
/root
ENV
HOME /root
ENV
HOME /root
# pre-configure port 8080 (no TSL)
COPY
deps/server.xml deps/server-connector.xml* ${CATALINA_BASE}/conf/
COPY
deps/soda.logging.properties ${CATALINA_BASE}/conf/
COPY
deps/setenv.sh ${CATALINA_BASE}/bin/
# DB used for authorization
# Tomcat must load DB-driver (postgresql_*.jar), vlkb-soda does not explicitely load DB-drivers
COPY
deps/postgresql-*.jar ${CATALINA_BASE}/lib
# modif permissions to allow run as non-root: need to config TSL and ROOT-CONTEXT
WORKDIR
${CATALINA_BASE}
RUN
chmod
-R
a+rwX conf
env
ACCESS_CONTEXT_ROOT=datasets
RUN
apt-get
-y
update
\
RUN
apt-get
-y
update
\
&&
apt-get
-y
install
apt-utils
\
&&
apt-get
-y
install
apt-utils
\
...
@@ -22,8 +37,10 @@ RUN apt-get -y update \
...
@@ -22,8 +37,10 @@ RUN apt-get -y update \
ENV
WEBAPP_DIR=/webapps/vlkb-soda
ENV
WEBAPP_DIR=/webapps/vlkb-soda
WORKDIR
/root
COPY
deps/ast_9.2.9-1_amd64.deb ./
COPY
deps/ast_9.2.9-1_amd64.deb ./
RUN
dpkg
-i
/root/ast_9.2.9-1_amd64.deb
&&
ldconfig
\
RUN
dpkg
-i
/root/ast_9.2.9-1_amd64.deb
&&
ldconfig
\
&&
mkdir
-p
${
WEBAPP_DIR
}
\
&&
mkdir
-p
${
WEBAPP_DIR
}
\
&&
mkdir
-p
/srv/datasets
\
&&
mkdir
-p
/srv/datasets
\
...
@@ -43,33 +60,17 @@ ENV INST_DIR=/usr/local
...
@@ -43,33 +60,17 @@ ENV INST_DIR=/usr/local
RUN
echo
"
${
INST_DIR
}
/lib"
>
/etc/ld.so.conf.d/ast.conf
&&
ldconfig
\
RUN
echo
"
${
INST_DIR
}
/lib"
>
/etc/ld.so.conf.d/ast.conf
&&
ldconfig
\
&&
echo
"fits_path_surveys=/srv/datasets"
>
$WEBAPP_DIR
/WEB-INF/classes/cutout.properties
&&
echo
"fits_path_surveys=/srv/datasets"
>
$WEBAPP_DIR
/WEB-INF/classes/cutout.properties
# pre-configure port 8080 (no TSL)
COPY
deps/server.xml deps/server-connector.xml* ${CATALINA_BASE}/conf/
COPY
deps/soda.logging.properties ${CATALINA_BASE}/conf/
COPY
deps/setenv.sh ${CATALINA_BASE}/bin/
COPY
deps/context.xml ${WEBAPP_DIR}/META-INF/context.xml
COPY
deps/context.xml ${WEBAPP_DIR}/META-INF/context.xml
# DB used for authorization
# Tomcat must load DB-driver (postgresql_*.jar), vlkb-soda does not explicitely load DB-drivers
COPY
deps/postgresql-*.jar ${CATALINA_BASE}/lib
# modif permissions to allow run as non-root: need to config TSL and ROOT-CONTEXT
WORKDIR
${CATALINA_BASE}
RUN
chmod
-R
a+rwX conf
# enable SKA IAM token filter update
# enable SKA IAM token filter update
RUN
chmod
a+rw
${
WEBAPP_DIR
}
/WEB-INF/web.xml
\
RUN
chmod
a+rw
${
WEBAPP_DIR
}
/WEB-INF/web.xml
\
&&
touch
${
WEBAPP_DIR
}
/WEB-INF/classes/ia2token.properties
\
&&
touch
${
WEBAPP_DIR
}
/WEB-INF/classes/ia2token.properties
\
&&
touch
${
WEBAPP_DIR
}
/WEB-INF/classes/iamtoken.properties
\
&&
touch
${
WEBAPP_DIR
}
/WEB-INF/classes/iamtoken.properties
\
&&
chmod
a+rw
${
WEBAPP_DIR
}
/WEB-INF/classes/
*
.properties
&&
chmod
a+rw
${
WEBAPP_DIR
}
/WEB-INF/classes/
*
.properties
env
ACCESS_CONTEXT_ROOT=datasets
# configure during start-up
# configure during start-up
COPY
start-soda.sh.soda /root/start-soda.sh
COPY
start-soda.sh.soda /root/start-soda.sh
RUN
chmod
+rx /root
&&
chmod
+rx /root/start-soda.sh
RUN
chmod
+rx /root
&&
chmod
+rx /root/start-soda.sh
USER
1000:1000
USER
1000:1000
CMD
["sh", "-c", "/root/start-soda.sh"]
CMD
["sh", "-c", "/root/start-soda.sh"]
...
...
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
sign in
to comment