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

docker: fixes path to survey_populate.csv and cleans up (removes commented parts)

parent bd87f67a

docker/Dockerfile.vlkb

+4 −32
Original line number Diff line number Diff line
@@ -12,48 +12,20 @@ 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 \

RUN mkdir -p /webapps/vlkb-search

# && mkdir /config

# && mkdir -p /srv/surveys && mkdir -p /srv/cutouts



RUN mkdir -p /webapps/vlkb-search

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 \

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

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

 && mkdir /srv/surveys

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-search does not explicitely load DB-driver





# configure instance



ENV INST_DIR=/usr/local



#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



# 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



# 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 config-vlkb/formatresponsefilter.properties /webapps/vlkb-search/WEB-INF/classes/



#COPY ssl/keystore.jks /root/

docker/compose-siav2.yaml

+8 −10
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ services: 
    #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"

    #network_mode: "host"

    environment:

      - SECURITY=

      - POSTGRES_PASSWORD=ia2vlkb
@@ -18,8 +18,7 @@ services: 
  siav2:

    container_name: siav2

    image: siav2:latest

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

    network_mode: "host"

      #network_mode: "host"

    environment:

      - SECURITY=

      #- SECURITY=ia2token
@@ -28,13 +27,12 @@ services: 
      - 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

    volumes:

      - /srv/vlkb/surveys:/srv/surveys:z

      #- ./config-vlkb:/config:z

      #- ./ssl:/etc/pki/tls:z

      #restart: always

docker/entrypoint.sh

+2 −92
Original line number Diff line number Diff line
@@ -11,35 +11,18 @@ env 
#INST_DIR="/usr/local"

WEBAPP_DIR=/webapps

#CONFIG_DIR=/config

#QUEUE_NAME=dockervlkb$ACCESS_CONTEXT_ROOT



echo "SECURITY   : "$SECURITY

echo "DISCOVERY_CONTEXT_ROOT : "$DISCOVERY_CONTEXT_ROOT

echo "DISCOVERY_DB_URI       : "$DISCOVERY_DB_URI

#echo "VLKBOBSCORE_PG_URI     : "$VLKBOBSCORE_PG_URI

#echo "ACCESS_CONTEXT_ROOT    : "$ACCESS_CONTEXT_ROOT

echo "RESPONSE_FORMAT        : "$RESPONSE_FORMAT

echo "URL_CUTOUTS            : "$URL_CUTOUTS

echo "INST_DIR   : "$INST_DIR

echo "WEBAPP_DIR : "$WEBAPP_DIR

#echo "CONFIG_DIR : "$CONFIG_DIR

#echo "QUEUE_NAME : "$QUEUE_NAME

#########################################################################







## configure vlkb-tools

#mkdir -p $INST_DIR/etc/vlkb-obscore

#cp $CONFIG_DIR/vlkb-obscore.datasets.conf $INST_DIR/etc/vlkb-obscore/datasets.conf

#if test -n "$VLKBOBSCORE_PG_URI"

#then

#   echo "pg_uri=$VLKBOBSCORE_PG_URI" >> $INST_DIR/etc/vlkb-obscore/datasets.conf

#   echo "pg_schema=datasets"         >> $INST_DIR/etc/vlkb-obscore/datasets.conf

#fi







## configure VLKB discovery

if test -n "$DISCOVERY_CONTEXT_ROOT" && test -n "$DISCOVERY_DB_URI"

then
@@ -48,7 +31,6 @@ then 
     cd $WEBAPP_DIR/vlkb-search/WEB-INF/ && rm -f web.xml && cp web-search-$SECURITY.xml web.xml && cd -

   fi



#   cp $CONFIG_DIR/{auth.properties,neatoken.properties} $WEBAPP_DIR/vlkb-search/WEB-INF/classes/

   echo "<Context docBase=\"$WEBAPP_DIR/vlkb-search\"/>" > /var/lib/tomcat9/conf/Catalina/localhost/$DISCOVERY_CONTEXT_ROOT.xml

   echo "db_uri=$DISCOVERY_DB_URI"  >  $WEBAPP_DIR/vlkb-search/WEB-INF/classes/discovery.properties

   echo "db_schema=datasets"        >> $WEBAPP_DIR/vlkb-search/WEB-INF/classes/discovery.properties
@@ -63,66 +45,9 @@ then 
   fi









fi







## configure VLKB access

#if test -n "$ACCESS_CONTEXT_ROOT"

#then



#   if test -n "$SECURITY"

#   then

#      cd $WEBAPP_DIR/vlkb-cutout/WEB-INF/ && rm -f web.xml && cp web-cutout-$SECURITY.xml web.xml && cd -

#   fi



#   cp $CONFIG_DIR/{auth.properties,neatoken.properties} $WEBAPP_DIR/vlkb-cutout/WEB-INF/classes/

   #echo "<Context docBase=\"$WEBAPP_DIR/vlkb-cutout\"/>" > /var/lib/tomcat9/conf/Catalina/localhost/$ACCESS_CONTEXT_ROOT.xml

#   cp $WEBAPP_DIR/vlkb-cutout/META-INF/context.xml /var/lib/tomcat9/conf/Catalina/localhost/$ACCESS_CONTEXT_ROOT.xml

#   echo "db_uri=$DISCOVERY_DB_URI"  >  $WEBAPP_DIR/vlkb-cutout/WEB-INF/classes/authpolicy.properties

#   echo "db_schema=datasets"        >> $WEBAPP_DIR/vlkb-cutout/WEB-INF/classes/authpolicy.properties

#   echo "db_user_name=$DB_USERNAME" >> $WEBAPP_DIR/vlkb-cutout/WEB-INF/classes/authpolicy.properties

#   echo "db_password=$DB_PASSWORD"  >> $WEBAPP_DIR/vlkb-cutout/WEB-INF/classes/authpolicy.properties





#   echo "fits_path_surveys=/srv/surveys" > $WEBAPP_DIR/vlkb-cutout/WEB-INF/classes/datasets.conf

#   echo "fits_path_cutouts=/srv/cutouts" >> $WEBAPP_DIR/vlkb-cutout/WEB-INF/classes/datasets.conf

#   if test -f /srv/surveys/survey_populate.csv

#   then

#      echo "surveys_metadata_abs_pathname=/srv/surveys/survey_populate.csv" >> $WEBAPP_DIR/vlkb-cutout/WEB-INF/classes/datasets.conf

#      echo "fits_url_cutouts=$URL_CUTOUTS" >> $WEBAPP_DIR/vlkb-cutout/WEB-INF/classes/datasets.conf

#   fi

#   if test -n "$RESPONSE_FORMAT"

#   then

#      echo "default_response_format=$RESPONSE_FORMAT" >> $WEBAPP_DIR/vlkb-cutout/WEB-INF/classes/datasets.conf

#   fi



#   case $RESPONSE_FORMAT in application/vlkb*)

#      echo "default_sky_system=GALACTIC"   >> $WEBAPP_DIR/vlkb-cutout/WEB-INF/classes/datasets.conf

#      echo "default_spec_system=VELO_LSRK" >> $WEBAPP_DIR/vlkb-cutout/WEB-INF/classes/datasets.conf

#      echo "show_duration=yes"             >> $WEBAPP_DIR/vlkb-cutout/WEB-INF/classes/datasets.conf

#   esac



   # for resolver (id & extraCards)

#   echo "db_uri=$DISCOVERY_DB_URI"  >> $WEBAPP_DIR/vlkb-cutout/WEB-INF/classes/datasets.conf

#   echo "db_schema=datasets"        >> $WEBAPP_DIR/vlkb-cutout/WEB-INF/classes/datasets.conf

#   echo "db_user_name=$DB_USERNAME" >> $WEBAPP_DIR/vlkb-cutout/WEB-INF/classes/datasets.conf

#   echo "db_password=$DB_PASSWORD"  >> $WEBAPP_DIR/vlkb-cutout/WEB-INF/classes/datasets.conf



#   echo "amqp_host_name=localhost"     >> $WEBAPP_DIR/vlkb-cutout/WEB-INF/classes/datasets.conf

#   echo "amqp_port=5672"               >> $WEBAPP_DIR/vlkb-cutout/WEB-INF/classes/datasets.conf

#   echo "amqp_routing_key=$QUEUE_NAME" >> $WEBAPP_DIR/vlkb-cutout/WEB-INF/classes/datasets.conf



#   case $RESPONSE_FORMAT in application/vlkb*)

#      service rabbitmq-server start

#      $INST_DIR/bin/vlkbd_exec.sh localhost $QUEUE_NAME $INST_DIR/etc/vlkbd/datasets.conf

#   esac

#fi







# configure port/SSL connector: (path is relative to the dir where compose.yaml is

# - web.xml to run filters set above

# * ssl: set tomcat connector with certificates (ia2 needs SECTIGO, iam needs self-signed keystore.jks)
@@ -131,18 +56,12 @@ fi 
# set volume mapping in compose.yaml: ssl/ -> /etc/pki/tls/

case $SECURITY in

   ia2token)

      #cp ssl/server-connector-8443.xml-SECTIGO-vlkb_ia2_inaf_it  /etc/tomcat9/server-connector-8443.xml

      cp /root/ssl/server-connector-8443.xml /etc/tomcat9/server-connector-8443.xml

      # map volume instead of this: cp -r ssl/SECTIGO /etc/pki/tls/

      rm /webapps/vlkb-search/WEB-INF/lib/jjwt-*0.12*.jar

#      rm /webapps/vlkb-cutout/WEB-INF/lib/jjwt-*0.12*.jar

      ;;

   iamtoken)

      #cp ssl/server-connector-8443.xml-keystore-self-signed  /etc/tomcat9/server-connector-8443.xml

      cp /root/ssl/server-connector-8443.xml  /etc/tomcat9/server-connector-8443.xml

      # map volume somedir:/etc/pki/tls with somedir/{keystore.jks,SECTIGO/*} XXX cp ssl/keystore.jks /etc/pki/tls/

      rm /webapps/vlkb-search/WEB-INF/lib/jjwt-*0.11*.jar

#      rm /webapps/vlkb-cutout/WEB-INF/lib/jjwt-*0.11*.jar

      ;;

   *)

      echo "Security not configured, runs open."
@@ -151,15 +70,6 @@ esac 






#if test -f /srv/surveys/keystore.jks

#then

#   cp /srv/surveys/keystore.jks /root/

#fi

#if test -f /srv/surveys/server-connector-8443.xml /etc/tomcat9/

#then

#   cp /srv/surveys/server-connector-8443.xml /etc/tomcat9/

#fi

#

if test -n "$SECURITY"

then

   cd /etc/tomcat9/ && ln -s server-connector-8443.xml server-connector.xml && cd -
@@ -167,15 +77,15 @@ else 
   cd /etc/tomcat9/ && ln -s server-connector-8080.xml server-connector.xml && cd -

fi







# configure access-token validation

if test -f /srv/surveys/iamtoken.properties

then

#   cp /srv/surveys/iamtoken.properties $WEBAPP_DIR/vlkb-cutout/WEB-INF/classes/

   cp /srv/surveys/iamtoken.properties $WEBAPP_DIR/vlkb-search/WEB-INF/classes/

fi





#########################################################################



date