diff --git a/docker/Dockerfile.vlkb b/docker/Dockerfile.vlkb index 91d5150e6126bac47a470a110d9daea56cc94959..14545e640f4d2377b103dcfd4a06aa4da57522b5 100644 --- a/docker/Dockerfile.vlkb +++ b/docker/Dockerfile.vlkb @@ -14,22 +14,20 @@ RUN apt -y update \ COPY ast_9.2.9-1_amd64.deb ./ RUN dpkg -i /root/ast_9.2.9-1_amd64.deb && ldconfig \ - && mkdir -p /webapps/vlkb-search && mkdir -p /webapps/vlkb-cutout && mkdir /config \ + && mkdir -p /webapps/vlkb-cutout && mkdir /config \ && mkdir -p /srv/surveys && mkdir -p /srv/cutouts ARG VLKB_VERSION COPY vlkb-${VLKB_VERSION}.deb vlkb-obscore-${VLKB_VERSION}.deb vlkbd-${VLKB_VERSION}.deb ./ -COPY vlkb-search-${VLKB_VERSION}.war /webapps/vlkb-search/ COPY vlkb-cutout-${VLKB_VERSION}.war /webapps/vlkb-cutout/ RUN dpkg -i vlkb-${VLKB_VERSION}.deb vlkb-obscore-${VLKB_VERSION}.deb vlkbd-${VLKB_VERSION}.deb \ - && cd /webapps/vlkb-search && jar -xf vlkb-search-${VLKB_VERSION}.war \ && cd /webapps/vlkb-cutout && jar -xf vlkb-cutout-${VLKB_VERSION}.war COPY postgresql-*.jar /var/lib/tomcat9/lib # Lines with postgresql_*.jar: provide DB-driver so Tomcat loads it -# vlkb-search vlkb-cutout do not explicitely load DB-drivers +# vlkb-cutout does not explicitely load DB-drivers @@ -52,7 +50,6 @@ COPY config-vlkb/vlkbd.datasets.conf ${INST_DIR}/etc/vlkbd/datasets.conf # created in entrypoint.sh COPY config-vlkb/servlet.cutout.properties /webapps/vlkb-cutout/WEB-INF/classes/cutout.properties COPY config-vlkb/auth.properties config-vlkb/neatoken.properties config-vlkb/iamtoken.properties /webapps/vlkb-cutout/WEB-INF/classes/ -COPY config-vlkb/auth.properties config-vlkb/neatoken.properties config-vlkb/iamtoken.properties config-vlkb/formatresponsefilter.properties /webapps/vlkb-search/WEB-INF/classes/ #COPY ssl/keystore.jks /root/ COPY ssl/server.xml ssl/server-connector-8080.xml ssl/server-connector-8443.xml /etc/tomcat9/ diff --git a/docker/Makefile b/docker/Makefile index 3f8f87798cca0290af7ff60daca293b028d91765..3e63e1f6686fecf5deba6100109688a546339336 100644 --- a/docker/Makefile +++ b/docker/Makefile @@ -5,9 +5,9 @@ VERSION ?= $(shell git describe) all: -download-all: vlkb-search vlkb-cutout vlkbd vlkb-obscore vlkb +download-all: vlkb-cutout vlkbd vlkb-obscore vlkb -vlkb-search vlkb-cutout: +vlkb-cutout: make download PACK_FILE=$@-$(VERSION).war vlkbd vlkb-obscore vlkb: diff --git a/docker/compose-example-vlkb.yaml b/docker/compose-example-vlkb.yaml index 45de84ae3ffb061e7359ffa16f7b93c65eea10ad..88b66b5d61a69037b37436567c56bc7826307cdd 100644 --- a/docker/compose-example-vlkb.yaml +++ b/docker/compose-example-vlkb.yaml @@ -28,21 +28,16 @@ services: environment: - SECURITY= #- SECURITY=ia2token - - DISCOVERY_CONTEXT_ROOT=vlkb#datasets#vlkb_search - - DISCOVERY_DB_URI=jdbc:postgresql://pasquale.ia2.ianf.it:5432/vialactea - - DB_USERNAME=vialactea - - DB_PASSWORD=ia2vlkb - - VLKBOBSCORE_PG_URI=postgresql://vialactea:ia2vlkb@pasquale.ia2.inaf.it:5432/vialactea + #- VLKBOBSCORE_PG_URI=postgresql://vialactea:ia2vlkb@pasquale.ia2.inaf.it:5432/vialactea - ACCESS_CONTEXT_ROOT=vlkb#datasets - URL_CUTOUTS=vlkb-devel.ia2.inaf.it:8004/cutouts + - RESPONSE_FORMAT=application/x-vlkb+xml #- RESPONSE_FORMAT=application/fits - - RESPONSE_FORMAT=application/vlkb+xml #- RESPONSE_FORMAT=application/fits;createfile=yes volumes: - #- ./config-vlkb:/config:Z - /srv/vlkb/surveys:/srv/surveys:z,ro - /srv/vlkb/cutouts:/srv/cutouts:z,rw - restart: always + #restart: always volumes: