Commit bd87f67a authored by Robert Butora's avatar Robert Butora
Browse files

docker: adds config-vlkb/ ssl/ and example compose-siav2.yaml and adopts... 

docker: adds config-vlkb/ ssl/ and example compose-siav2.yaml and adopts Dockerfile and entrypoint.sh to vlkb-search only
parent 607389b8

docker/Dockerfile.vlkb

+21 −19
Original line number Diff line number Diff line
@@ -12,21 +12,23 @@ RUN apt -y update \ 
                   rabbitmq-server openjdk-17-jre openjdk-17-jdk tomcat9 tomcat9-admin \

                   postgresql-client



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 /srv/surveys && mkdir -p /srv/cutouts

#COPY ast_9.2.9-1_amd64.deb ./

#RUN dpkg -i /root/ast_9.2.9-1_amd64.deb && ldconfig \

RUN mkdir -p /webapps/vlkb-search

# && 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-${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 \

 && mv /webapps/vlkb-search/WEB-INF/lib/postgresql-*.jar /var/lib/tomcat9/lib \

 && rm /webapps/vlkb-cutout/WEB-INF/lib/postgresql-*.jar

#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 \

RUN cd /webapps/vlkb-search && jar -xf vlkb-search-${VLKB_VERSION}.war

# && cd /webapps/vlkb-cutout && jar -xf vlkb-cutout-${VLKB_VERSION}.war \

# && mv /webapps/vlkb-search/WEB-INF/lib/postgresql-*.jar /var/lib/tomcat9/lib \

# && rm /webapps/vlkb-cutout/WEB-INF/lib/postgresql-*.jar

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
@@ -37,21 +39,21 @@ RUN dpkg -i vlkb-${VLKB_VERSION}.deb vlkb-obscore-${VLKB_VERSION}.deb vlkbd-${VL 


ENV INST_DIR=/usr/local



COPY vlkbd_exec.sh ${INST_DIR}/bin

#COPY vlkbd_exec.sh ${INST_DIR}/bin



RUN mkdir -p ${INST_DIR}/etc/vlkb-obscore \

 && mkdir -p ${INST_DIR}/etc/vlkbd \

 && echo "${INST_DIR}/lib" > /etc/ld.so.conf.d/ast.conf \

 && ldconfig

#RUN mkdir -p ${INST_DIR}/etc/vlkb-obscore \

# && mkdir -p ${INST_DIR}/etc/vlkbd \

# && echo "${INST_DIR}/lib" > /etc/ld.so.conf.d/ast.conf \

# && ldconfig



# configure during docker build-time



COPY config-vlkb/vlkb-obscore.datasets.conf ${INST_DIR}/etc/vlkb-obscore/datasets.conf

COPY config-vlkb/vlkbd.datasets.conf ${INST_DIR}/etc/vlkbd/datasets.conf

#COPY config-vlkb/vlkb-obscore.datasets.conf ${INST_DIR}/etc/vlkb-obscore/datasets.conf

#COPY config-vlkb/vlkbd.datasets.conf ${INST_DIR}/etc/vlkbd/datasets.conf



# created in entrypoint.sh COPY config-vlkb/servlet.datasets.conf /webapps/vlkb-cutout/WEB-INF/classes/datasets.conf



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 /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/

docker/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ ast-9.2.9.tar.gz: 


.PHONY: build

build:

	docker build --build-arg VLKB_VERSION=$(VERSION) -t soda -f Dockerfile.vlkb .

	docker build --build-arg VLKB_VERSION=$(VERSION) -t siav2 -f Dockerfile.vlkb .



# the docker-login below needed a ca-cert(?) which in the middle of the certificate-chain,

# but was not automatically downloaded and also local cert/ket pair(?) ->

docker/compose-siav2.yaml

0 → 100644
+43 −0
Original line number Diff line number Diff line 
version: '2'



services:



  vlkb-db:

    container_name: vlkb-db

    #image: git.ia2.inaf.it:5050/butora/vlkb-datasets/postgres-pgsphere:latest

    image: registry.gitlab.com/ska-telescope/src/visivo-vlkb-soda:1.5.2

    #image: postgres-pgsphere:latest

    network_mode: "host"

    environment:

      - SECURITY=

      - POSTGRES_PASSWORD=ia2vlkb

    volumes:

      - postgres-data:/var/lib/postgresql/data





  siav2:

    container_name: siav2

    image: siav2:latest

      #image: git.ia2.inaf.it:5050/butora/vlkb-datasets/soda:latest

    network_mode: "host"

    environment:

      - SECURITY=

        #- SECURITY=ia2token

      - DISCOVERY_CONTEXT_ROOT=vlkb#datasets#vlkb_search

      - DISCOVERY_DB_URI=jdbc:postgresql://localhost:5432/vialactea

      - DB_USERNAME=vialactea

      - DB_PASSWORD=ia2vlkb

        #- VLKBOBSCORE_PG_URI=postgresql://vialactea:ia2vlkb@localhost:5432/vialactea

        #- ACCESS_CONTEXT_ROOT=vlkb#datasets

      #- RESPONSE_FORMAT=application/x-vlkb+xml

      #- RESPONSE_FORMAT=application/x-votable+xml

      #volumes:

      #- ./config-vlkb:/config:Z

      #- /srv/vlkb/surveys:/srv/surveys:Z

      #- /srv/vlkb/cutouts:/srv/cutouts:Z

      #restart: always





volumes:

  postgres-data:

docker/config-vlkb/Obsolete/context-cutout.xml

0 → 100644
+15 −0
Original line number Diff line number Diff line 
<Context docBase="/webapps/vlkb-cutout">



        <Resources allowLinking="true">

                <PostResources readOnly="false"

                        className="org.apache.catalina.webresources.DirResourceSet"

                        base="/srv/cutouts"

                        webAppMount="/cutouts"/>

                <PostResources readOnly="true"

                        className="org.apache.catalina.webresources.DirResourceSet"

                        base="/srv/surveys"

                        webAppMount="/surveys"/>

        </Resources>



</Context>

docker/config-vlkb/Obsolete/tomcat-users.xml

0 → 100644
+48 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="UTF-8"?>

<!--

  Licensed to the Apache Software Foundation (ASF) under one or more

  contributor license agreements.  See the NOTICE file distributed with

  this work for additional information regarding copyright ownership.

  The ASF licenses this file to You under the Apache License, Version 2.0

  (the "License"); you may not use this file except in compliance with

  the License.  You may obtain a copy of the License at



      http://www.apache.org/licenses/LICENSE-2.0



  Unless required by applicable law or agreed to in writing, software

  distributed under the License is distributed on an "AS IS" BASIS,

  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

  See the License for the specific language governing permissions and

  limitations under the License.

-->

<tomcat-users xmlns="http://tomcat.apache.org/xml"

              xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

              xsi:schemaLocation="http://tomcat.apache.org/xml tomcat-users.xsd"

              version="1.0">

<!--

  NOTE:  By default, no user is included in the "manager-gui" role required

  to operate the "/manager/html" web application.  If you wish to use this app,

  you must define such a user - the username and password are arbitrary. It is

  strongly recommended that you do NOT use one of the users in the commented out

  section below since they are intended for use with the examples web

  application.

-->

<!--

  NOTE:  The sample user and role entries below are intended for use with the

  examples web application. They are wrapped in a comment and thus are ignored

  when reading this file. If you wish to configure these users for use with the

  examples web application, do not forget to remove the <!.. ..> that surrounds

  them. You will also need to set the passwords to something appropriate.

-->

<!--

  <role rolename="tomcat"/>

  <role rolename="role1"/>

  <user username="tomcat" password="<must-be-changed>" roles="tomcat"/>

  <user username="both" password="<must-be-changed>" roles="tomcat,role1"/>

  <user username="role1" password="<must-be-changed>" roles="role1"/>

-->



  <role rolename="manager-script"/>

  <user username="admin" password="IA2lbt09" roles="manager-script"/>

</tomcat-users>