Commit 046f5441 authored by Robert Butora's avatar Robert Butora
Browse files

docker: moves fits-path config to docker-build-time and removes RESPONSEFORMAT... 

docker: moves fits-path config to docker-build-time and removes RESPONSEFORMAT config from soda-docker
parent 02230231

docker/Dockerfile.soda

+2 −1
Original line number Diff line number Diff line
@@ -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/

docker/Dockerfile.soda.temurin-jammy

+2 −1
Original line number Diff line number Diff line
@@ -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

docker/Dockerfile.vlkb

+2 −1
Original line number Diff line number Diff line
@@ -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

docker/start-soda.sh.soda

+0 −22
Original line number Diff line number Diff line
@@ -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

docker/start-soda.sh.vlkb

+0 −2
Original line number Diff line number Diff line
@@ -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