docker: adds build with temurin-jammy (Ubuntu, jdk) with the same entrypoint.sh.soda (194b8f9a) · Commits · ViaLactea / vlkb-soda

docker/Dockerfile.soda

+1 −1

Original line number	Diff line number	Diff line
		@@ -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

+3 −8

Original line number	Diff line number	Diff line
		#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

+3 −0

Original line number	Diff line number	Diff line
		@@ -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 .