From c657f56a926b39b67b5172063b14cb7d57ca703e Mon Sep 17 00:00:00 2001
From: Robert Butora <robert.butora@inaf.it>
Date: Tue, 24 Sep 2024 15:45:17 +0200
Subject: [PATCH] docker: remove unused examples and debian dockerfile; fix
filename typo on logging conf file
---
Makefile | 8 +--
docker/Dockerfile.soda | 52 +++++++-------
docker/Dockerfile.soda.temurin-jammy | 68 ------------------
docker/Makefile | 3 -
...ing.properites => soda.logging.properties} | 0
docker/example-compose-ska-soda.yaml | 39 ----------
docker/example-compose-soda.yaml | 40 ++++++++---
docker/example-security/README.tex | 10 ++-
.../example-security/garrtoken/keystore.jks | Bin 2696 -> 0 bytes
.../garrtoken/neatoken.properties | 10 ---
...onnector-8443.xml-self-signed-keystore-jks | 11 ---
.../iamtoken/iamtoken.properties | 13 ----
12 files changed, 65 insertions(+), 189 deletions(-)
delete mode 100644 docker/Dockerfile.soda.temurin-jammy
rename docker/deps/{soda.logging.properites => soda.logging.properties} (100%)
delete mode 100644 docker/example-compose-ska-soda.yaml
delete mode 100644 docker/example-security/garrtoken/keystore.jks
delete mode 100644 docker/example-security/garrtoken/neatoken.properties
delete mode 100644 docker/example-security/garrtoken/server-connector-8443.xml-self-signed-keystore-jks
delete mode 100644 docker/example-security/iamtoken/iamtoken.properties
diff --git a/Makefile b/Makefile
index ff6a061..13371a8 100644
--- a/Makefile
+++ b/Makefile
@@ -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
diff --git a/docker/Dockerfile.soda b/docker/Dockerfile.soda
index 8c9f052..21ccb03 100644
--- a/docker/Dockerfile.soda
+++ b/docker/Dockerfile.soda
@@ -1,62 +1,55 @@
-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"]
diff --git a/docker/Dockerfile.soda.temurin-jammy b/docker/Dockerfile.soda.temurin-jammy
deleted file mode 100644
index 21ccb03..0000000
--- a/docker/Dockerfile.soda.temurin-jammy
+++ /dev/null
@@ -1,68 +0,0 @@
-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"]
-
diff --git a/docker/Makefile b/docker/Makefile
index 8baf688..95bf21b 100644
--- a/docker/Makefile
+++ b/docker/Makefile
@@ -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 .
diff --git a/docker/deps/soda.logging.properites b/docker/deps/soda.logging.properties
similarity index 100%
rename from docker/deps/soda.logging.properites
rename to docker/deps/soda.logging.properties
diff --git a/docker/example-compose-ska-soda.yaml b/docker/example-compose-ska-soda.yaml
deleted file mode 100644
index df3c1a7..0000000
--- a/docker/example-compose-ska-soda.yaml
+++ /dev/null
@@ -1,39 +0,0 @@
-version: '3'
-
-services:
-
- ska:
- container_name: ska
- #image: git.ia2.inaf.it:5050/butora/vlkb-datasets/soda:latest
- #image: registry.gitlab.com/ska-telescope/src/visivo-vlkb-soda:1.5.6
- image: soda:latest
- ports:
- - 18019:8080
- environment:
- - SECURITY=
- - ACCESS_CONTEXT_ROOT=ska#datasets
- #- RESPONSE_FORMAT=application/fits
- #- RESPONSE_FORMAT=application/fits;createfile=yes
- volumes:
- - /srv/ska/surveys:/srv/surveys:ro
- #- /srv/ska/cutouts:/srv/cutouts:z,rw
- restart: always
-
-
- ska-ssl:
- container_name: ska-ssl
- #image: git.ia2.inaf.it:5050/butora/vlkb-datasets/soda:latest
- #image: registry.gitlab.com/ska-telescope/src/visivo-vlkb-soda:1.5.6
- image: soda:latest
- ports:
- - 18025:8443
- environment:
- - SECURITY=iamtoken
- - ACCESS_CONTEXT_ROOT=ska#datasets
- #- RESPONSE_FORMAT=application/fits
- #- RESPONSE_FORMAT=application/fits;createfile=yes
- volumes:
- - /srv/ska/surveys:/srv/surveys:z,ro
- #- /srv/ska/cutouts:/srv/cutouts:z,rw
- restart: always
-
diff --git a/docker/example-compose-soda.yaml b/docker/example-compose-soda.yaml
index c9d65bc..59fc971 100644
--- a/docker/example-compose-soda.yaml
+++ b/docker/example-compose-soda.yaml
@@ -2,27 +2,51 @@ version: '3'
services:
- soda:
- container_name: soda-vlkb
- image: git.ia2.inaf.it:5050/vialactea/vlkb-soda/soda:1.6.3
+ ska:
+ container_name: ska
+ image: harbor.srcdev.skao.int/soda/visivo-vlkb-soda:1.7
+ user: 5000:5000
ports:
- 18019:8080
environment:
- ACCESS_CONTEXT_ROOT=ska#datasets
volumes:
- - /srv/ska/surveys:/srv/surveys:z,ro
+ - /srv/ska/surveys:/srv/surveys:ro
restart: always
- soda-ssl:
- container_name: soda-ssl-vlkb
- image: git.ia2.inaf.it:5050/vialactea/vlkb-soda/soda:1.6.3
+ ska-tls:
+ container_name: ska-tls
+ image: harbor.srcdev.skao.int/soda/visivo-vlkb-soda:1.7
+ user: 5000:5000
ports:
- 18025:8443
environment:
- - SECURITY=ia2token
- ACCESS_CONTEXT_ROOT=ska#datasets
+ - KEYSTORE_ALIAS=tomcat
volumes:
- /srv/ska/surveys:/srv/surveys:ro
+ - ./security/keystore.jks:/etc/pki/tls/keystore.jks:ro
+ - ./security/keystore.pwd:/etc/pki/tls/keystore.pwd:ro
restart: always
+
+ ska-tls-iam:
+ container_name: ska-tls-iam
+ image: harbor.srcdev.skao.int/soda/visivo-vlkb-soda:1.7
+ user: 5000:5000
+ ports:
+ - 18025:8443
+ environment:
+ - ACCESS_CONTEXT_ROOT=ska#datasets
+ - KEYSTORE_ALIAS=tomcat
+ - SKAIAM_INTROSPECT=https://iam-escape.cloud.cnaf.infn.it/introspect
+ - SKAIAM_CLIENT=02cc260f-9837-4907-b2cb-a1a2d764fb15
+ - SKAIAM_PASSWORD=AJMi3qrB6AHRp_6y55tEwU-IpJ8uZ6X4QXeQ3W4la6dc-BlkzAY1OQpAE9hb1W7-VfYl4208FUtjE2Cl3hUYLkQ
+ volumes:
+ - /srv/ska/surveys:/srv/surveys:ro
+ - ./security/keystore.jks:/etc/pki/tls/keystore.jks:ro
+ - ./security/keystore.pwd:/etc/pki/tls/keystore.pwd:ro
+ restart: always
+
+
diff --git a/docker/example-security/README.tex b/docker/example-security/README.tex
index 9c98827..599a06e 100644
--- a/docker/example-security/README.tex
+++ b/docker/example-security/README.tex
@@ -6,7 +6,6 @@
# -- ia2 needs SECTIGO
# -- iam needs self-signed keystore.jks
# * keep right jjwt*.jar libs (ia2 authlib needs v0.11, iam needs v0.12)
-# FIXME implement *.properties and server-connector.xml by paramters
@@ -14,7 +13,7 @@
# SSL-certificates are site-dependent and must be regularly updated:
# vlkb-soda expects them in /etc/pki/tls
#
-# map volume: ./security:/etc/pki/tls:z,ro
+# map volume: ./security:/etc/pki/tls:ro
#
# ia2token:
# auth.propeties
@@ -22,10 +21,9 @@
# server-connector.xml
# SECTIGO/*
#
-# iamtoken:
-# iamtoken.properties
-# server-connector.xml
-# keystore.jks
+# iamtoken: env KEYSTORE_ALIAS=tomcat
+# keystore.jks
+# keystore.pwd
#
diff --git a/docker/example-security/garrtoken/keystore.jks b/docker/example-security/garrtoken/keystore.jks
deleted file mode 100644
index 57c469584925bdc3de5f6919123d67c5a3189560..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 2696
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
diff --git a/docker/example-security/garrtoken/neatoken.properties b/docker/example-security/garrtoken/neatoken.properties
deleted file mode 100644
index 839e15d..0000000
--- a/docker/example-security/garrtoken/neatoken.properties
+++ /dev/null
@@ -1,10 +0,0 @@
-
-# certificates endpoint
-jwks_url=
-
-# account created for the service
-resource_id=
-
-# username for non-authenticated requests
-non_authn_username=anonymous
-
diff --git a/docker/example-security/garrtoken/server-connector-8443.xml-self-signed-keystore-jks b/docker/example-security/garrtoken/server-connector-8443.xml-self-signed-keystore-jks
deleted file mode 100644
index 02ca450..0000000
--- a/docker/example-security/garrtoken/server-connector-8443.xml-self-signed-keystore-jks
+++ /dev/null
@@ -1,11 +0,0 @@
- <Connector port="8443" protocol="org.apache.coyote.http11.Http11AprProtocol"
- maxThreads="150" SSLEnabled="true" >
- <UpgradeProtocol className="org.apache.coyote.http2.Http2Protocol" />
- <SSLHostConfig>
- <Certificate certificateKeyAlias="tomcat"
- certificateKeystoreFile="/etc/pki/tls/keystore.jks"
- certificateKeystorePassword="tomcatskassl"
- type="RSA" />
- </SSLHostConfig>
- </Connector>
-
diff --git a/docker/example-security/iamtoken/iamtoken.properties b/docker/example-security/iamtoken/iamtoken.properties
deleted file mode 100644
index d275d68..0000000
--- a/docker/example-security/iamtoken/iamtoken.properties
+++ /dev/null
@@ -1,13 +0,0 @@
-
-# certificates endpoint
-#jwks_url=
-introspect=
-client_name=
-client_password=
-
-# account created for the service
-resource_id=
-
-# username for non-authenticated requests
-non_authn_username=anonymous
-
--
GitLab