docker: remove unused examples and debian dockerfile; fix filename typo on logging conf file (c657f56a) · Commits · ViaLactea / vlkb-soda

Makefile

+4 −4

Original line number	Diff line number	Diff line
		@@ -30,8 +30,8 @@ clean:
		# 20250401 Owner glpat-JhqpFhEGvxuVzHqxjwqx
		.PHONY: upload-war-deb
		upload-war-deb:
		curl --header "PRIVATE-TOKEN: glpat-JhqpFhEGvxuVzHqxjwqx" --upload-file vlkb-soda-$(VERSION).war https://ict.inaf.it/gitlab/api/v4/projects/1780/packages/generic/vlkb-soda/1.5/vlkb-soda-$(VERSION).war
		curl --header "PRIVATE-TOKEN: glpat-JhqpFhEGvxuVzHqxjwqx" --upload-file vlkb-$(VERSION).deb https://ict.inaf.it/gitlab/api/v4/projects/1780/packages/generic/vlkb-soda/1.5/vlkb-$(VERSION).deb
		curl --header "PRIVATE-TOKEN: glpat-JhqpFhEGvxuVzHqxjwqx" --upload-file vlkb-obscore-$(VERSION).deb https://ict.inaf.it/gitlab/api/v4/projects/1780/packages/generic/vlkb-soda/1.5/vlkb-obscore-$(VERSION).deb
		curl --header "PRIVATE-TOKEN: glpat-JhqpFhEGvxuVzHqxjwqx" --upload-file vlkbd-$(VERSION).deb https://ict.inaf.it/gitlab/api/v4/projects/1780/packages/generic/vlkb-soda/1.5/vlkbd-$(VERSION).deb
		curl --header "PRIVATE-TOKEN: glpat-JhqpFhEGvxuVzHqxjwqx" --upload-file vlkb-soda-$(VERSION).war https://ict.inaf.it/gitlab/api/v4/projects/1780/packages/generic/vlkb-soda/1.7/vlkb-soda-$(VERSION).war
		curl --header "PRIVATE-TOKEN: glpat-JhqpFhEGvxuVzHqxjwqx" --upload-file vlkb-$(VERSION).deb https://ict.inaf.it/gitlab/api/v4/projects/1780/packages/generic/vlkb-soda/1.7/ubuntu22/vlkb-$(VERSION).deb
		curl --header "PRIVATE-TOKEN: glpat-JhqpFhEGvxuVzHqxjwqx" --upload-file vlkb-obscore-$(VERSION).deb https://ict.inaf.it/gitlab/api/v4/projects/1780/packages/generic/vlkb-soda/1.7/ubuntu22/vlkb-obscore-$(VERSION).deb
		curl --header "PRIVATE-TOKEN: glpat-JhqpFhEGvxuVzHqxjwqx" --upload-file vlkbd-$(VERSION).deb https://ict.inaf.it/gitlab/api/v4/projects/1780/packages/generic/vlkb-soda/1.7/ubuntu22/vlkbd-$(VERSION).deb

docker/Dockerfile.soda

+25 −27

Original line number	Diff line number	Diff line
		FROM debian:bullseye-slim
		FROM tomcat:9-jre17-temurin-jammy
		# From: https://hub.docker.com/_/tomcat/
		# The default Tomcat environment in the image is:
		# CATALINA_BASE: /usr/local/tomcat
		# CATALINA_HOME: /usr/local/tomcat
		# CATALINA_TMPDIR: /usr/local/tomcat/temp
		# JRE_HOME: /usr
		# CLASSPATH: /usr/local/tomcat/bin/bootstrap.jar:/usr/local/tomcat/bin/tomcat-juli.jar
		# The configuration files are available in /usr/local/tomcat/conf/.

		ENV CATALINA_BASE=/usr/local/tomcat
		ENV CATALINA_HOME=/usr/local/tomcat

		WORKDIR /root
		ENV HOME /root

		RUN apt-get -y update \
		&& apt-get -y --no-install-recommends install libcfitsio9 \
		unzip openjdk-17-jre-headless tomcat9 libtcnative-1 ca-certificates

		ENV CATALINA_BASE=/var/lib/tomcat9
		ENV CATALINA_HOME=/usr/share/tomcat9
		RUN apt-get -y update \
		&& apt-get -y install apt-utils \
		&& apt-get -y install libcfitsio-bin unzip

		RUN rm -rf $CATALINA_BASE/webapps/examples/ \
		$CATALINA_BASE/webapps/docs/ \
		$CATALINA_BASE/webapps/host-manager

		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 \
		&& mkdir -p ${WEBAPP_DIR} \
		&& mkdir -p /srv/surveys \
		&& mkdir -p /srv/cutouts \
		&& mkdir -p /srv/surveys && mkdir -p /srv/cutouts \
		&& mkdir -p /etc/pki/tls

		ARG VLKB_VERSION

		COPY vlkb-${VLKB_VERSION}.deb ./
		COPY vlkb-soda-${VLKB_VERSION}.war ${WEBAPP_DIR}/
		RUN dpkg -i vlkb-${VLKB_VERSION}.deb \
		&& cd ${WEBAPP_DIR} && unzip vlkb-soda-${VLKB_VERSION}.war \
		&& apt-get autoremove && apt-get clean \
		&& rm -f $WEBAPP_DIR/WEB-INF/lib/jjwt-0.11.jar
		# remove jjwt used by IA2 (IA2 and IAM token filters used different ver of jjwt)


		# configure build instance
		# configure instance

		ENV INST_DIR=/usr/local

		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)
		# 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/

		env ACCESS_CONTEXT_ROOT=datasets

		# configure at start-up

		COPY start-soda.sh.soda /root/start-soda.sh

		# modif permissions to allow run as non-root
		WORKDIR ${CATALINA_HOME}
		# orig was: chmod 1777 logs temp work;
		# logs --> /var/log/tomcat9 work --> /var/cache/tomcat9 temp (missing)
		RUN chmod -R +rX .; chmod 1777 /var/log/tomcat9 /var/cache/tomcat9
		# modif permissions to allow run as non-root: need to config TSL and ROOT-CONTEXT
		WORKDIR ${CATALINA_BASE}
		RUN chmod -R a+rwX conf

		@@ -64,6 +57,11 @@ RUN chmod -R a+rwX conf
		RUN chmod a+rw ${WEBAPP_DIR}/WEB-INF/web.xml \
		&& chmod a+rw ${WEBAPP_DIR}/WEB-INF/classes/iamtoken.properties

		env ACCESS_CONTEXT_ROOT=datasets
		# configure during start-up
		COPY start-soda.sh.soda /root/start-soda.sh


		RUN chmod +rx /root && chmod +rx /root/start-soda.sh
		USER 1000:1000
		CMD ["sh", "-c", "/root/start-soda.sh"]

docker/Dockerfile.soda.temurin-jammy

deleted100644 → 0

+0 −68

Original line number	Diff line number	Diff line
		FROM tomcat:9-jre17-temurin-jammy
		# From: https://hub.docker.com/_/tomcat/
		# The default Tomcat environment in the image is:
		# CATALINA_BASE: /usr/local/tomcat
		# CATALINA_HOME: /usr/local/tomcat
		# CATALINA_TMPDIR: /usr/local/tomcat/temp
		# JRE_HOME: /usr
		# CLASSPATH: /usr/local/tomcat/bin/bootstrap.jar:/usr/local/tomcat/bin/tomcat-juli.jar
		# The configuration files are available in /usr/local/tomcat/conf/.

		ENV CATALINA_BASE=/usr/local/tomcat
		ENV CATALINA_HOME=/usr/local/tomcat

		WORKDIR /root
		ENV HOME /root


		RUN apt-get -y update \
		&& apt-get -y install apt-utils \
		&& apt-get -y install libcfitsio-bin unzip


		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 \
		&& mkdir -p ${WEBAPP_DIR} \
		&& mkdir -p /srv/surveys && mkdir -p /srv/cutouts \
		&& mkdir -p /etc/pki/tls

		ARG VLKB_VERSION
		COPY vlkb-${VLKB_VERSION}.deb ./
		COPY vlkb-soda-${VLKB_VERSION}.war ${WEBAPP_DIR}/
		RUN dpkg -i vlkb-${VLKB_VERSION}.deb \
		&& cd ${WEBAPP_DIR} && unzip vlkb-soda-${VLKB_VERSION}.war \
		&& rm -f $WEBAPP_DIR/WEB-INF/lib/jjwt-0.11.jar
		# remove jjwt used by IA2 (IA2 and IAM token filters used different ver of jjwt)

		# configure instance

		ENV INST_DIR=/usr/local

		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

		# 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/

		# 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
		RUN chmod a+rw ${WEBAPP_DIR}/WEB-INF/web.xml \
		&& chmod a+rw ${WEBAPP_DIR}/WEB-INF/classes/iamtoken.properties

		env ACCESS_CONTEXT_ROOT=datasets
		# configure during start-up
		COPY start-soda.sh.soda /root/start-soda.sh


		RUN chmod +rx /root && chmod +rx /root/start-soda.sh
		USER 1000:1000
		CMD ["sh", "-c", "/root/start-soda.sh"]

docker/Makefile

+0 −3

Original line number	Diff line number	Diff line
		@@ -31,9 +31,6 @@ ast-9.2.9.tar.gz:


		.PHONY: build
		build-soda-temurin-jammy:
		docker build --build-arg VLKB_VERSION=$(VERSION) -t soda -f Dockerfile.soda.temurin-jammy .

		build-soda:
		docker build --build-arg VLKB_VERSION=$(VERSION) -t soda -f Dockerfile.soda .

docker/deps/soda.logging.properites→docker/deps/soda.logging.properties

+0 −0

File moved.

View file