From 8f5126ac40994474f93e9e5df25148bd619c34f3 Mon Sep 17 00:00:00 2001
From: Robert Butora <robert.butora@inaf.it>
Date: Wed, 3 Apr 2024 17:34:22 +0200
Subject: [PATCH] docker: changes proj name vlkb-cutout -> vlkb-soda
---
docker/Dockerfile | 8 ++++----
docker/Makefile | 4 ++--
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 383913c..da78c85 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 70f5ec6..50b3a7d 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:
--
GitLab