From 92a34f230efea2e3bbfc190e1721adf062645f1a Mon Sep 17 00:00:00 2001
From: Robert Butora <robert.butora@inaf.it>
Date: Wed, 22 May 2024 14:45:52 +0200
Subject: [PATCH] adds pure-SODA compose and updates README
---
README.md | 36 ++++++++++++++++++++++++++++
docker/example-compose-ska-soda.yaml | 4 ++--
docker/example-compose-soda.yaml | 28 ++++++++++++++++++++++
docker/example-compose-vlkb.yaml | 7 +++---
4 files changed, 70 insertions(+), 5 deletions(-)
create mode 100644 docker/example-compose-soda.yaml
diff --git a/README.md b/README.md
index e4855ff..3d5b810 100644
--- a/README.md
+++ b/README.md
@@ -2,6 +2,42 @@
is a web-application to access astronomical data stored in FITS-files.
It implements SODA IVOA recommendation v1.0 (https://ivoa.net/documents/SODA/20170517/index.html).
+
+Docker image is available in this repository and cean be launched by the following compose.yaml
+
+```yaml
+version: '3'
+
+services:
+
+ soda:
+ container_name: soda-vlkb
+ image: git.ia2.inaf.it:5050/vialactea/vlkb-soda/soda:1.6.3
+ ports:
+ - 18019:8080
+ environment:
+ - ACCESS_CONTEXT_ROOT=ska#datasets
+ volumes:
+ - /srv/ska/surveys:/srv/surveys:z,ro
+ restart: always
+
+
+ soda-ssl:
+ container_name: soda-ssl-vlkb
+ image: git.ia2.inaf.it:5050/vialactea/vlkb-soda/soda:1.6.3
+ ports:
+ - 18025:8443
+ environment:
+ - SECURITY=ia2token
+ - ACCESS_CONTEXT_ROOT=ska#datasets
+ volumes:
+ - /srv/ska/surveys:/srv/surveys:z,ro
+ restart: always
+```
+
+
+## SODA for VLKB
+
Additionally to SODAv1 it also provides VLKB-specific functions:
- the filtering paramters (POS, BAND) can be given in GALACTIC and VELO-LSRK-km/s coordinates systems
diff --git a/docker/example-compose-ska-soda.yaml b/docker/example-compose-ska-soda.yaml
index cd555e7..416d57a 100644
--- a/docker/example-compose-ska-soda.yaml
+++ b/docker/example-compose-ska-soda.yaml
@@ -16,7 +16,7 @@ services:
#- RESPONSE_FORMAT=application/fits;createfile=yes
volumes:
- /srv/ska/surveys:/srv/surveys:z,ro
- - /srv/ska/cutouts:/srv/cutouts:z,rw
+ #- /srv/ska/cutouts:/srv/cutouts:z,rw
restart: always
@@ -34,6 +34,6 @@ services:
#- RESPONSE_FORMAT=application/fits;createfile=yes
volumes:
- /srv/ska/surveys:/srv/surveys:z,ro
- - /srv/ska/cutouts:/srv/cutouts:z,rw
+ #- /srv/ska/cutouts:/srv/cutouts:z,rw
restart: always
diff --git a/docker/example-compose-soda.yaml b/docker/example-compose-soda.yaml
new file mode 100644
index 0000000..cf96f18
--- /dev/null
+++ b/docker/example-compose-soda.yaml
@@ -0,0 +1,28 @@
+version: '3'
+
+services:
+
+ soda:
+ container_name: soda-vlkb
+ image: git.ia2.inaf.it:5050/vialactea/vlkb-soda/soda:1.6.3
+ ports:
+ - 18019:8080
+ environment:
+ - ACCESS_CONTEXT_ROOT=ska#datasets
+ volumes:
+ - /srv/ska/surveys:/srv/surveys:z,ro
+ restart: always
+
+
+ soda-ssl:
+ container_name: soda-ssl-vlkb
+ image: git.ia2.inaf.it:5050/vialactea/vlkb-soda/soda:1.6.3
+ ports:
+ - 18025:8443
+ environment:
+ - SECURITY=ia2token
+ - ACCESS_CONTEXT_ROOT=ska#datasets
+ volumes:
+ - /srv/ska/surveys:/srv/surveys:z,ro
+ restart: always
+
diff --git a/docker/example-compose-vlkb.yaml b/docker/example-compose-vlkb.yaml
index 46c34f6..8306694 100644
--- a/docker/example-compose-vlkb.yaml
+++ b/docker/example-compose-vlkb.yaml
@@ -20,13 +20,14 @@ services:
vlkb:
container_name: vlkb
- image: soda:latest
- #image: git.ia2.inaf.it:5050/butora/vlkb-datasets/soda:latest
+ #image: soda:latest
+ #image: git.ia2.inaf.it:5050/butora/vlkb-datasets/soda:latest
+ image: git.ia2.inaf.it:5050/vialactea/vlkb-soda/soda:1.6.3
hostname: vlkb
ports:
- 8080:8080
environment:
- - SECURITY=
+ #- SECURITY=
#- SECURITY=ia2token
#- VLKBOBSCORE_PG_URI=postgresql://vialactea:ia2vlkb@pasquale.ia2.inaf.it:5432/vialactea
- ACCESS_CONTEXT_ROOT=vlkb#datasets
--
GitLab