Skip to content
Snippets Groups Projects
Commit 194b8f9a authored by Robert Butora's avatar Robert Butora
Browse files

docker: adds build with temurin-jammy (Ubuntu, jdk) with the same entrypoint.sh.soda

parent 55c729d9
No related branches found
No related tags found
No related merge requests found
...@@ -40,7 +40,7 @@ ENV INST_DIR=/usr/local ...@@ -40,7 +40,7 @@ ENV INST_DIR=/usr/local
RUN echo "${INST_DIR}/lib" > /etc/ld.so.conf.d/ast.conf && ldconfig RUN echo "${INST_DIR}/lib" > /etc/ld.so.conf.d/ast.conf && ldconfig
# change webapps-dir and preconfigure port 8080 (no SSL) # 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 # configure at start-up
......
#FROM debian:bullseye-slim
#LABEL description="vlkb tomcat9"
FROM tomcat:9-jre17-temurin-jammy FROM tomcat:9-jre17-temurin-jammy
#ENV JAVA_HOME=/usr/lib/jvm/java-17-openjdk-amd64 ENV CATALINA_BASE=/usr/local/tomcat
#ENV CATALINA_BASE=/var/lib/tomcat9 ENV CATALINA_HOME=/usr/local/tomcat
#ENV CATALINA_HOME=/usr/share/tomcat9
#ENV CATALINA_TMPDIR=/tmp
WORKDIR /root WORKDIR /root
ENV HOME /root ENV HOME /root
...@@ -47,8 +43,7 @@ RUN echo "${INST_DIR}/lib" > /etc/ld.so.conf.d/ast.conf && ldconfig ...@@ -47,8 +43,7 @@ RUN echo "${INST_DIR}/lib" > /etc/ld.so.conf.d/ast.conf && ldconfig
# configure during docker build-time # configure during docker build-time
# precofigure port 8080 (no SSL) # 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 ${CATALINA_BASE}/conf/
#COPY deps/server.xml deps/server-connector.xml /etc/tomcat9/
# configure during docker run-time # configure during docker run-time
......
...@@ -31,6 +31,9 @@ ast-9.2.9.tar.gz: ...@@ -31,6 +31,9 @@ ast-9.2.9.tar.gz:
.PHONY: build .PHONY: build
build-soda-ubuntu:
docker build --build-arg VLKB_VERSION=$(VERSION) -t soda -f Dockerfile.soda.temurin-jammy .
build-soda: build-soda:
docker build --build-arg VLKB_VERSION=$(VERSION) -t soda -f Dockerfile.soda . docker build --build-arg VLKB_VERSION=$(VERSION) -t soda -f Dockerfile.soda .
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment