diff --git a/docker/Dockerfile b/docker/Dockerfile index 383913c429d9d529392c5189a0fb02d2bb24a510..da78c855a60c63c398a297e40517f38760eda042 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -17,7 +17,7 @@ ENV CATALINA_BASE=/var/lib/tomcat9 ENV CATALINA_HOME=/usr/share/tomcat9 ENV CATALINA_TMPDIR=/tmp -ENV WEBAPP_DIR=/webapps/vlkb-cutout +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 \ @@ -29,11 +29,11 @@ RUN dpkg -i /root/ast_9.2.9-1_amd64.deb && ldconfig \ ARG VLKB_VERSION COPY vlkb-${VLKB_VERSION}.deb vlkb-obscore-${VLKB_VERSION}.deb vlkbd-${VLKB_VERSION}.deb ./ -COPY vlkb-cutout-${VLKB_VERSION}.war ${WEBAPP_DIR}/ +COPY vlkb-soda-${VLKB_VERSION}.war ${WEBAPP_DIR}/ RUN dpkg -i vlkb-${VLKB_VERSION}.deb vlkb-obscore-${VLKB_VERSION}.deb vlkbd-${VLKB_VERSION}.deb \ - && cd ${WEBAPP_DIR} && jar -xf vlkb-cutout-${VLKB_VERSION}.war + && cd ${WEBAPP_DIR} && jar -xf vlkb-soda-${VLKB_VERSION}.war -# Tomcat must load DB-driver (postgresql_*.jar), vlkb-cutout does not explicitely load DB-drivers +# Tomcat must load DB-driver (postgresql_*.jar), vlkb-soda does not explicitely load DB-drivers COPY deps/postgresql-*.jar /var/lib/tomcat9/lib diff --git a/docker/Makefile b/docker/Makefile index 70f5ec6c13976a8abc989e802c9309a428971d6e..50b3a7daa6dca5656d8fd6785c9921a617664421 100644 --- a/docker/Makefile +++ b/docker/Makefile @@ -5,9 +5,9 @@ VERSION ?= $(shell git describe) all: -download-all: vlkb-cutout vlkbd vlkb-obscore vlkb +download-all: vlkb-soda vlkbd vlkb-obscore vlkb -vlkb-cutout: +vlkb-soda: make download PACK_FILE=$@-$(VERSION).war vlkbd vlkb-obscore vlkb: