From 046f5441e813c41d655b427b315755773e73cff0 Mon Sep 17 00:00:00 2001
From: Robert Butora <robert.butora@inaf.it>
Date: Fri, 20 Sep 2024 09:01:56 +0200
Subject: [PATCH] docker: moves fits-path config to docker-build-time and
removes RESPONSEFORMAT config from soda-docker
---
docker/Dockerfile.soda | 3 ++-
docker/Dockerfile.soda.temurin-jammy | 3 ++-
docker/Dockerfile.vlkb | 3 ++-
docker/start-soda.sh.soda | 22 ----------------------
docker/start-soda.sh.vlkb | 2 --
5 files changed, 6 insertions(+), 27 deletions(-)
diff --git a/docker/Dockerfile.soda b/docker/Dockerfile.soda
index 1528e38..3ebeb08 100644
--- a/docker/Dockerfile.soda
+++ b/docker/Dockerfile.soda
@@ -37,7 +37,8 @@ RUN dpkg -i vlkb-${VLKB_VERSION}.deb \
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/surveys" > $WEBAPP_DIR/WEB-INF/classes/cutout.properties
# change webapps-dir and preconfigure port 8080 (no SSL)
COPY deps/server.xml deps/server-connector.xml ${CATALINA_BASE}/conf/
diff --git a/docker/Dockerfile.soda.temurin-jammy b/docker/Dockerfile.soda.temurin-jammy
index 8dd926e..9c98341 100644
--- a/docker/Dockerfile.soda.temurin-jammy
+++ b/docker/Dockerfile.soda.temurin-jammy
@@ -38,7 +38,8 @@ RUN dpkg -i vlkb-${VLKB_VERSION}.deb \
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/surveys" > $WEBAPP_DIR/WEB-INF/classes/cutout.properties
# configure during docker build-time
diff --git a/docker/Dockerfile.vlkb b/docker/Dockerfile.vlkb
index 0326cb1..7673df8 100644
--- a/docker/Dockerfile.vlkb
+++ b/docker/Dockerfile.vlkb
@@ -48,7 +48,8 @@ COPY deps/vlkbd_exec.sh ${INST_DIR}/bin
RUN mkdir -p ${INST_DIR}/etc/vlkb-obscore \
&& mkdir -p ${INST_DIR}/etc/vlkbd \
&& echo "${INST_DIR}/lib" > /etc/ld.so.conf.d/ast.conf \
- && ldconfig
+ && ldconfig \
+ && echo "fits_path_surveys=/srv/surveys" > $WEBAPP_DIR/WEB-INF/classes/cutout.properties
# configure during docker build-time
diff --git a/docker/start-soda.sh.soda b/docker/start-soda.sh.soda
index fdcd57e..01417d8 100755
--- a/docker/start-soda.sh.soda
+++ b/docker/start-soda.sh.soda
@@ -15,28 +15,6 @@ cp $WEBAPP_DIR/META-INF/context.xml $CATALINA_BASE/conf/Catalina/localhost/$ACCE
echo "fits_path_surveys=/srv/surveys" > $WEBAPP_DIR/WEB-INF/classes/cutout.properties
-{ # write cutout.properties
-
- case $RESPONSE_FORMAT in
- application/fits)
- ;;
- "application/fits;createfile=yes")
- echo "default_response_format=$RESPONSE_FORMAT"
- echo "fits_path_cutouts=/srv/cutouts"
- ;;
- application/x-vlkb*)
- echo "default_response_format=$RESPONSE_FORMAT"
- echo "fits_path_cutouts=/srv/cutouts"
- echo "fits_url_cutouts=$URL_CUTOUTS"
- echo "surveys_metadata_abs_pathname=/srv/surveys/survey_populate.csv"
- echo "default_sky_system=ICRS"
- echo "default_spec_system=WAVE_Barycentric"
- echo "show_duration=yes"
- ;;
- esac
-
-} >> $WEBAPP_DIR/WEB-INF/classes/cutout.properties
-
## Security
diff --git a/docker/start-soda.sh.vlkb b/docker/start-soda.sh.vlkb
index ee0ad57..11c203a 100755
--- a/docker/start-soda.sh.vlkb
+++ b/docker/start-soda.sh.vlkb
@@ -42,8 +42,6 @@ fi
cp $WEBAPP_DIR/META-INF/context.xml $CATALINA_BASE/conf/Catalina/localhost/$ACCESS_CONTEXT_ROOT.xml
-echo "fits_path_surveys=/srv/surveys" > $WEBAPP_DIR/WEB-INF/classes/cutout.properties
-
{ # write cutout.properties
case $RESPONSE_FORMAT in
--
GitLab