Commit 5f85af2b authored by Robert Butora's avatar Robert Butora
Browse files

docker: removes config-vlkb from entrypoint and cleans up compose-vlkb.yaml

parent dfdf3f42

docker/compose-siav2.yaml

+18 −16
Original line number Diff line number Diff line 


# NOTE: pg_hba: /var/lib/docker/volumes/docker_postgres-data/_data/pg_hba.conf



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"

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

    ports:

      - 5432:5432

    environment:

      - SECURITY=

      - POSTGRES_PASSWORD=ia2vlkb
@@ -15,15 +17,16 @@ services: 
      - postgres-data:/var/lib/postgresql/data





  siav2:

    container_name: siav2

  vlkb-search:

    container_name: vlkb-search

    image: siav2:latest

      #network_mode: "host"

    ports:

      - 8080:8080

    environment:

      - SECURITY=

        #- SECURITY=ia2token

      - DISCOVERY_CONTEXT_ROOT=vlkb#datasets#vlkb_search

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

      - DISCOVERY_DB_URI=jdbc:postgresql://vlkb-db:5432/vialactea

      - DB_USERNAME=vialactea

      - DB_PASSWORD=ia2vlkb

        #- VLKBOBSCORE_PG_URI=postgresql://vialactea:ia2vlkb@localhost:5432/vialactea
@@ -31,11 +34,10 @@ services: 
        #- RESPONSE_FORMAT=application/x-votable+xml

    volumes:

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

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

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

    #restart: always





volumes:

  postgres-data:

docker/entrypoint.sh

+0 −2
Original line number Diff line number Diff line
@@ -10,7 +10,6 @@ env 
#########################################################################

#INST_DIR="/usr/local"

WEBAPP_DIR=/webapps

#CONFIG_DIR=/config



echo "SECURITY   : "$SECURITY

echo "DISCOVERY_CONTEXT_ROOT : "$DISCOVERY_CONTEXT_ROOT
@@ -19,7 +18,6 @@ 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

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