diff --git a/docker/Dockerfile.soda b/docker/Dockerfile.soda index 194153e653da10672826be2279ca3d3c4cbae0e9..0579b8e55030aac7ea457b56da4bb33faf97ec72 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 cf05f29ae062ed693a3fc59c3aee603937aaf381..eb66b165cd6936a3b3234393a45312eb825c7c1a 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 95bf21b9c7902715ffe9ea096c8400b2159de3db..16f684c354e4b40517f2a66693edb873af7c731b 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 .