From 5f85af2b3652f8c5661734bfbe719e1faa83d0e3 Mon Sep 17 00:00:00 2001
From: Robert Butora <robert.butora@inaf.it>
Date: Sun, 24 Mar 2024 10:03:14 +0100
Subject: [PATCH] docker: removes config-vlkb from entrypoint and cleans up
compose-vlkb.yaml
---
docker/compose-siav2.yaml | 34 ++++++++++++++++++----------------
docker/entrypoint.sh | 2 --
2 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/docker/compose-siav2.yaml b/docker/compose-siav2.yaml
index 5649aff..5bfbbbf 100644
--- a/docker/compose-siav2.yaml
+++ b/docker/compose-siav2.yaml
@@ -1,13 +1,15 @@
+
+# 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,27 +17,27 @@ 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
+ #- 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
- #- RESPONSE_FORMAT=application/x-vlkb+xml
- #- RESPONSE_FORMAT=application/x-votable+xml
+ #- VLKBOBSCORE_PG_URI=postgresql://vialactea:ia2vlkb@localhost:5432/vialactea
+ #- RESPONSE_FORMAT=application/x-vlkb+xml
+ #- RESPONSE_FORMAT=application/x-votable+xml
volumes:
- /srv/vlkb/surveys:/srv/surveys:z
- #- ./config-vlkb:/config:z
- #- ./ssl:/etc/pki/tls:z
- #restart: always
-
+ #- ./ssl:/etc/pki/tls:z
+ #restart: always
volumes:
postgres-data:
+
diff --git a/docker/entrypoint.sh b/docker/entrypoint.sh
index 50d63d5..c631869 100755
--- a/docker/entrypoint.sh
+++ b/docker/entrypoint.sh
@@ -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
#########################################################################
--
GitLab