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
ca1400b5
Commit
ca1400b5
authored
7 months ago
by
Robert Butora
Browse files
Options
Downloads
Patches
Plain Diff
docker: adds DEBUG_LEVEL and ensures start-script vars are set
parent
04816161
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
docker/Dockerfile.soda
+1
-1
1 addition, 1 deletion
docker/Dockerfile.soda
docker/deps/soda.logging.properties
+3
-0
3 additions, 0 deletions
docker/deps/soda.logging.properties
docker/start-soda.sh.soda
+17
-5
17 additions, 5 deletions
docker/start-soda.sh.soda
with
21 additions
and
6 deletions
docker/Dockerfile.soda
+
1
−
1
View file @
ca1400b5
...
...
@@ -57,7 +57,7 @@ RUN chmod -R a+rwX conf
# enable SKA IAM token filter update
RUN chmod a+rw ${WEBAPP_DIR}/WEB-INF/web.xml \
&& chmod a+rw ${WEBAPP_DIR}/WEB-INF/classes/
iamtoken
.properties
&& chmod a+rw ${WEBAPP_DIR}/WEB-INF/classes/
*
.properties
env ACCESS_CONTEXT_ROOT=datasets
# configure during start-up
...
...
This diff is collapsed.
Click to expand it.
docker/deps/soda.logging.properties
+
3
−
0
View file @
ca1400b5
...
...
@@ -65,4 +65,7 @@ org.apache.catalina.core.ContainerBase.[Catalina].[localhost].handlers = java.ut
# vlkb-soda
ServletCutout.level
=
CONFIG
ResolverFromId.level
=
INFO
SodaImpl.level
=
INFO
VlkbCli.level
=
INFO
This diff is collapsed.
Click to expand it.
docker/start-soda.sh.soda
+
17
−
5
View file @
ca1400b5
...
...
@@ -6,6 +6,13 @@ set -eux
date
env
# set optional
ACCESS_CONTEXT_ROOT
=
${
ACCESS_CONTEXT_ROOT
:-
datasets
}
SECURITY
=
${
SECURITY
:-}
KEYSTORE_ALIAS
=
${
KEYSTORE_ALIAS
:-}
SKAIAM_INTROSPECT
=
${
SKAIAM_INTROSPECT
:-}
SKAIAM_CLIENT
=
${
SKAIAM_CLIENT
:-}
SKAIAM_PASSWORD
=
${
SKAIAM_PASSWORD
:-}
# configure CONTEXT_ROOT
...
...
@@ -35,13 +42,11 @@ then
cp
$CATALINA_BASE
/conf/server-connector.xml-8443
$CATALINA_BASE
/conf/server-connector.xml
fi
case
$KEYSTORE_ALIAS
in
*
)
if
[
-n
$KEYSTORE_ALIAS
]
;
then
echo
"KEYSTORE_ALIAS: "
$KEYSTORE_ALIAS
sed
-i
"s/tomcat/
$KEYSTORE_ALIAS
/"
$CATALINA_BASE
/conf/server-connector.xml
;;
esac
fi
# configure SKA IAM
...
...
@@ -61,6 +66,13 @@ else
cp
$WEBAPP_DIR
/WEB-INF/web-cutout-iamtoken.xml
$WEBAPP_DIR
/WEB-INF/web.xml
fi
# config debug
DBG_LEVEL
=
${
DEBUG_LEVEL
:-
CONFIG
}
sed
-i
"s/.*ServletCutout
\.
level.*=.*/ServletCutout.level =
$DBG_LEVEL
/g"
$CATALINA_BASE
/conf/soda.logging.properties
sed
-i
"s/.*ResolverFromId
\.
level.*=.*/ResolverFromId.level =
$DBG_LEVEL
/g"
$CATALINA_BASE
/conf/soda.logging.properties
sed
-i
"s/.*SodaImpl
\.
level.*=.*/SodaImpl.level =
$DBG_LEVEL
/g"
$CATALINA_BASE
/conf/soda.logging.properties
sed
-i
"s/.*VlkbCli
\.
level.*=.*/VlkbCli.level =
$DBG_LEVEL
/g"
$CATALINA_BASE
/conf/soda.logging.properties
date
}
1> /tmp/start-soda.log 2>&1
...
...
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