build and docker changes proj name vlkb-search -> vlkb-siav2

Makefile

@@ -13,10 +13,14 @@ tgz:
 	&& cd -
 
 war:
-	make -C data-discovery create-war && mv data-discovery/target/vlkb-search*.war .
+	make -C data-discovery create-war && mv data-discovery/target/vlkb-siav2*.war .
 
 
 clean:
 	make -C data-discovery clean
 
 
+
+# Owner: glpat-6pUYzjmR_FgcmNTHHQyu
+upload:
+	curl --header "PRIVATE-TOKEN: glpat-6pUYzjmR_FgcmNTHHQyu" --upload-file vlkb-siav2-$(VERSION).war https://ict.inaf.it/gitlab/api/v4/projects/1771/packages/generic/vlkb-siav2/1.5/vlkb-siav2-$(VERSION).war

data-discovery/Makefile

 #===============================================================================
-NAME       := vlkb-search
+NAME       := vlkb-siav2
 VERSION    := $(shell git describe)
 WEBAPP_WAR := $(NAME)-$(VERSION).war
-CONTEXT_ROOT ?= vlkb/datasets/vlkb_search
+CONTEXT_ROOT ?= vlkb/datasets/siav2
 #===============================================================================
 LIB_DIR     ?= ../java-libs/lib
 CLASS_DIR   := target/classes

docker/Dockerfile

@@ -16,15 +16,15 @@ 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 WEBAPP_DIR=/webapps/vlkb-search
+ENV WEBAPP_DIR=/webapps/vlkb-siav2
 
 RUN mkdir -p ${WEBAPP_DIR}
 ARG VLKB_VERSION
-COPY vlkb-search-${VLKB_VERSION}.war ${WEBAPP_DIR}/
-RUN cd ${WEBAPP_DIR} && jar -xf vlkb-search-${VLKB_VERSION}.war \
+COPY vlkb-siav2-${VLKB_VERSION}.war ${WEBAPP_DIR}/
+RUN cd ${WEBAPP_DIR} && jar -xf vlkb-siav2-${VLKB_VERSION}.war \
  && mkdir /srv/surveys
 
-# Tomcat must load postgresql DB driver, vlkb-search does not explicitely load it
+# Tomcat must load postgresql DB driver, vlkb-siav2 does not explicitely load it
 COPY deps/postgresql-*.jar  /var/lib/tomcat9/lib
 
 # configure

docker/Makefile

@@ -5,9 +5,9 @@ VERSION ?= $(shell git describe)
 all:
 
 
-download-all: vlkb-search vlkb-cutout vlkbd vlkb-obscore vlkb
+download-all: vlkb-siav2 vlkb-soda vlkbd vlkb-obscore vlkb
 
-vlkb-search vlkb-cutout:
+vlkb-siav2 vlkb-soda:
 	make download PACK_FILE=$@-$(VERSION).war
 
 vlkbd vlkb-obscore vlkb:
@@ -43,9 +43,9 @@ build:
 # docker run ... git.ia2.inaf.it:5050/butora/vlkb-datasets/vlkb
 
 publish-locally-siav2:
-	docker tag siav2 git.ia2.inaf.it:5050/vialactea/vlkb-search/siav2:$(VERSION)
-	docker push      git.ia2.inaf.it:5050/vialactea/vlkb-search/siav2:$(VERSION)
-	docker image rm  git.ia2.inaf.it:5050/vialactea/vlkb-search/siav2:$(VERSION)
+	docker tag siav2 git.ia2.inaf.it:5050/vialactea/vlkb-siav2/siav2:$(VERSION)
+	docker push      git.ia2.inaf.it:5050/vialactea/vlkb-siav2/siav2:$(VERSION)
+	docker image rm  git.ia2.inaf.it:5050/vialactea/vlkb-siav2/siav2:$(VERSION)
 
 
 ##docker login registry.gitlab.com --> robert.butora xC*n