- baldur defined groups, singular key (readOnlyGroup, etc)

- Added HOST_IP so that each component can access other components via the nginx reverse proxy
- start shell script to allow the determination of the docker HOST_IP
- Added an extra test data file

Author: slloyd-src

config/baldur/baldur.properties

@@ -18,8 +18,8 @@ test.anon = true
 org.opencadc.baldur.entry = EMERLIN
 EMERLIN.pattern = ^caom:EMERLIN/.*
 EMERLIN.anon = true
-#EMERLIN.readOnlyGroups = ivo://skao.int/gms?prototyping-groups/mini-src/platform-users
-EMERLIN.readWriteGroups = ivo://skao.int/gms?prototyping-groups/mini-src/platform-users
+EMERLIN.readOnlyGroup = ivo://skao.int/gms?prototyping-groups/mini-src/platform-users
+EMERLIN.readWriteGroup = ivo://skao.int/gms?prototyping-groups/mini-src/platform-users
 
 
 #NOTE ~.pattern needs to conform to caom:{collection}/{observationID}

docker-compose.yml

@@ -5,7 +5,6 @@
 services:
   reg:
     image: images.opencadc.org/core/reg:1.1.1
-#    network_mode: "host"
     container_name: reg
     user: "tomcat:tomcat"
     ports:
@@ -15,13 +14,12 @@ services:
       - ./config/cacerts:/config/cacerts
       - ./config/cadc-registry.properties:/config/cadc-registry.properties:ro
     extra_hosts:
-      - "src-data-repo.co.uk:172.17.0.1"
+      - "src-data-repo.co.uk:${HOST_IP}"
     networks:
       - mynetwork
 
   baldur:
     image: images.opencadc.org/storage-inventory/baldur:0.3.7
-#    network_mode: "host"
     container_name: baldur
     user: "tomcat:tomcat"
     ports:
@@ -31,13 +29,12 @@ services:
       - ./config/cacerts:/config/cacerts
       - ./config/cadc-registry.properties:/config/cadc-registry.properties:ro
     extra_hosts:
-      - "src-data-repo.co.uk:172.17.0.1"
+      - "src-data-repo.co.uk:${HOST_IP}"
     networks:
       - mynetwork
 
   torkeep:
     image: images.opencadc.org/caom2/torkeep:0.1.4
-#    network_mode: "host"
     container_name: torkeep
     user: "tomcat:tomcat"
     ports:
@@ -48,15 +45,13 @@ services:
       - ./config/cadc-registry.properties:/config/cadc-registry.properties:ro
     restart: always
     extra_hosts:
-      - "src-data-repo.co.uk:172.17.0.1"
+      - "src-data-repo.co.uk:${HOST_IP}"
     networks:
       - mynetwork
 
   nginx:
     image: nginx:latest
     network_mode: "host"
- #   ports:
- #     - "80:80"
     container_name: nginx
     volumes:
       - ./config/nginx/nginx.conf:/etc/nginx/nginx.conf:ro

start-services.sh

@@ -0,0 +1,6 @@
+#!/bin/bash
+
+HOST_IP=$(ip -4 addr show docker0 | grep -oP '(?<=inet\s)\d+(\.\d+){3}')
+export HOST_IP
+
+docker-compose up -d

test_data.xml

@@ -0,0 +1,35 @@
+<caom2:Observation xmlns:caom2="http://www.opencadc.org/caom2/xml/v2.4" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="caom2:SimpleObservation" caom2:id="aa4851ba-9550-41fc-a920-759e2026d508">
+  <caom2:collection>EMERLIN</caom2:collection>
+  <caom2:observationID>TS8004_C_001_20190801_avg.ms</caom2:observationID>
+  <caom2:algorithm>
+    <caom2:name>exposure</caom2:name>
+  </caom2:algorithm>
+  <caom2:intent>science</caom2:intent>
+  <caom2:target>
+    <caom2:name>TBD</caom2:name>
+  </caom2:target>
+  <caom2:telescope>
+    <caom2:name>e</caom2:name>
+  </caom2:telescope>
+  <caom2:planes>
+    <caom2:plane caom2:id="fe3d66f9-31ab-4a61-b558-a5d98bf56970">
+      <caom2:productID>TS8004_C_001_20190801_avg.ms</caom2:productID>
+      <caom2:artifacts>
+        <caom2:artifact caom2:id="d8d1cd83-3283-483c-bbf4-281dc53fc388">
+          <caom2:uri>uri:foo/bar</caom2:uri>
+          <caom2:productType>science</caom2:productType>
+          <caom2:releaseType>meta</caom2:releaseType>
+          <caom2:contentType>application/measurement-set</caom2:contentType>
+          <caom2:contentLength>14935710969</caom2:contentLength>
+          <caom2:contentChecksum>md5:e56af5f3314f048648e19a82bf751f9a</caom2:contentChecksum>
+          <caom2:parts>
+            <caom2:part caom2:id="fcbdaf6d-99d1-4310-a5fb-165e194cf23b">
+              <caom2:name>name</caom2:name>
+              <caom2:chunks/>
+            </caom2:part>
+          </caom2:parts>
+        </caom2:artifact>
+      </caom2:artifacts>
+    </caom2:plane>
+  </caom2:planes>
+</caom2:Observation>