From 194b8f9a820ce879b6078ce03576dc555dd1001e Mon Sep 17 00:00:00 2001
From: Robert Butora <robert.butora@inaf.it>
Date: Thu, 19 Sep 2024 16:55:02 +0200
Subject: [PATCH] docker: adds build with temurin-jammy (Ubuntu, jdk) with the
 same entrypoint.sh.soda

---
 docker/Dockerfile.soda               |  2 +-
 docker/Dockerfile.soda.temurin-jammy | 11 +++--------
 docker/Makefile                      |  3 +++
 3 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/docker/Dockerfile.soda b/docker/Dockerfile.soda
index 194153e..0579b8e 100644
--- a/docker/Dockerfile.soda
+++ b/docker/Dockerfile.soda
@@ -40,7 +40,7 @@ ENV INST_DIR=/usr/local
 RUN echo "${INST_DIR}/lib" > /etc/ld.so.conf.d/ast.conf && ldconfig
 
 # change webapps-dir and preconfigure port 8080 (no SSL)
-COPY deps/server.xml deps/server-connector.xml /etc/tomcat9/
+COPY deps/server.xml deps/server-connector.xml ${CATALINA_BASE}/conf/
 
 # configure at start-up
 
diff --git a/docker/Dockerfile.soda.temurin-jammy b/docker/Dockerfile.soda.temurin-jammy
index cf05f29..eb66b16 100644
--- a/docker/Dockerfile.soda.temurin-jammy
+++ b/docker/Dockerfile.soda.temurin-jammy
@@ -1,11 +1,7 @@
-#FROM debian:bullseye-slim
-#LABEL description="vlkb tomcat9"
 FROM tomcat:9-jre17-temurin-jammy
 
-#ENV JAVA_HOME=/usr/lib/jvm/java-17-openjdk-amd64
-#ENV CATALINA_BASE=/var/lib/tomcat9
-#ENV CATALINA_HOME=/usr/share/tomcat9
-#ENV CATALINA_TMPDIR=/tmp
+ENV CATALINA_BASE=/usr/local/tomcat
+ENV CATALINA_HOME=/usr/local/tomcat
 
 WORKDIR /root
 ENV HOME /root
@@ -47,8 +43,7 @@ RUN echo "${INST_DIR}/lib" > /etc/ld.so.conf.d/ast.conf && ldconfig
 # configure during docker build-time
 
 # precofigure port 8080 (no SSL)
-COPY deps/server.xml deps/server-connector.xml /usr/local/tomcat/conf/
-#COPY deps/server.xml deps/server-connector.xml /etc/tomcat9/
+COPY deps/server.xml deps/server-connector.xml ${CATALINA_BASE}/conf/
 
 # configure during docker run-time
 
diff --git a/docker/Makefile b/docker/Makefile
index 95bf21b..16f684c 100644
--- a/docker/Makefile
+++ b/docker/Makefile
@@ -31,6 +31,9 @@ ast-9.2.9.tar.gz:
 
 
 .PHONY: build
+build-soda-ubuntu:
+	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 .
 
-- 
GitLab