Merge pull request #29 from ccdc-opensource/CSD-5888

Csd 5888

Author: rsimpson-ccdc

docker-compose.yml

@@ -11,7 +11,7 @@ services:
     depends_on:
       - ccdc-csd-searchservice
       - csd-request-entry
-    image: ccdcrepository.azurecr.io/webcsd:0.1.9
+    image: ccdcrepository.azurecr.io/webcsd:0.1.16
     ports:
       - 80:80
     volumes:
@@ -25,7 +25,7 @@ services:
     depends_on:
       - ccdc-csd-searchservice
       - csd-request-entry
-    image: ccdcrepository.azurecr.io/webcsdbackend:0.1.9
+    image: ccdcrepository.azurecr.io/webcsdbackend:0.1.16
     environment:
       - ServiceSettings__StructureInfoLocation=/csd-data/structure-links.csv
       - CCDC_LICENSING_CONFIGURATION=${CCDC_LICENSING_CONFIGURATION}
@@ -60,7 +60,7 @@ services:
   ccdc-csd-substructuresearch:
     labels:
       <<: *k8s-labels
-    image: ccdcrepository.azurecr.io/ccdc-csd-substructuresearch:0.1.9
+    image: ccdcrepository.azurecr.io/ccdc-csd-substructuresearch-api:0.1.16
     depends_on:
       - database-server
       - ccdc-csd-resultstore
@@ -75,11 +75,11 @@ services:
   ccdc-csd-deposition:
     labels:
       <<: *k8s-labels
-    image: ccdcrepository.azurecr.io/ccdc-csd-deposition:0.1.9
+    image: ccdcrepository.azurecr.io/ccdc-csd-deposition-api:0.1.16
     depends_on:
       - database-server
     environment:
-      - CsdReadConnection=Server=database-server;Port=5432;Database=csd-database;User Id=postgres;Password=${CSD_DB_PASSWORD};SearchPath=csd_schema
+      - CsdDepositionReadConnection=Server=database-server;Port=5432;Database=csd-database;User Id=postgres;Password=${CSD_DB_PASSWORD};SearchPath=csd_schema
     expose:
       - 80
 
@@ -88,7 +88,7 @@ services:
       <<: *k8s-labels
     depends_on:
       - database-server
-    image: ccdcrepository.azurecr.io/ccdc-csd-textnumericsearch:0.1.9
+    image: ccdcrepository.azurecr.io/ccdc-csd-textnumericsearch-api:0.1.16
     environment:
       - CsdReadConnection=Server=database-server;Port=5432;Database=csd-database;User Id=postgres;Password=${CSD_DB_PASSWORD};SearchPath=csd_schema
     expose:
@@ -102,7 +102,7 @@ services:
       - ccdc-csd-substructuresearch
       - ccdc-csd-resultstore
       - ccdc-csd-similaritysearch
-    image: ccdcrepository.azurecr.io/ccdc-csd-searchservice:0.1.9
+    image: ccdcrepository.azurecr.io/ccdc-csd-searchservice-api:0.1.16
     expose:
       - 80
 
@@ -113,9 +113,9 @@ services:
       - ccdc-csd-deposition
       - ccdc-csd-crystal-structure-export
       - database-server
-    image: ccdcrepository.azurecr.io/csd-request-entry:0.1.9
+    image: ccdcrepository.azurecr.io/csd-request-entry-api:0.1.16
     environment:
-      - CsdReadConnection=Server=database-server;Port=5432;Database=csd-database;User Id=postgres;Password=${CSD_DB_PASSWORD};SearchPath=csd_schema
+      - RequestEntryCsdReadConnection=Server=database-server;Port=5432;Database=csd-database;User Id=postgres;Password=${CSD_DB_PASSWORD};SearchPath=csd_schema
     expose:
       - 80
 
@@ -124,7 +124,7 @@ services:
       <<: *k8s-labels
     depends_on:
       - database-server
-    image: ccdcrepository.azurecr.io/ccdc-csd-formulasearch:0.1.9
+    image: ccdcrepository.azurecr.io/ccdc-csd-formulasearch-api:0.1.16
     environment:
       - FormulaSearchReadConnection=Server=database-server;Port=5432;Database=csd-database;User Id=postgres;Password=${CSD_DB_PASSWORD};SearchPath=formula
     expose:
@@ -136,7 +136,7 @@ services:
     depends_on:
       - database-server
       - ccdc-csd-reducedcell-calculation-service
-    image: ccdcrepository.azurecr.io/ccdc-csd-unitcellsearch:0.1.9
+    image: ccdcrepository.azurecr.io/ccdc-csd-unit-cell-search:0.1.16
     environment:
       - UnitCellSearchReadConnection=Server=database-server;Port=5432;Database=csd-database;User Id=postgres;Password=${CSD_DB_PASSWORD};SearchPath=unitcell
     expose:
@@ -145,7 +145,7 @@ services:
   ccdc-csd-resultstore:
     labels:
       <<: *k8s-labels
-    image: ccdcrepository.azurecr.io/ccdc-csd-resultstore:0.1.9
+    image: ccdcrepository.azurecr.io/ccdc-csd-resultstore-api:0.1.16
     environment:
       - OrderedCachePassword=${CSD_CACHE_PASSWORD}
     expose:
@@ -155,35 +155,35 @@ services:
     depends_on:
       - database-server
       - ccdc-csd-fingerprint
-    image: ccdcrepository.azurecr.io/ccdc-csd-similaritysearch:0.1.9
+    image: ccdcrepository.azurecr.io/ccdc-csd-structure-similarity-search:0.1.16
     environment:
       - StructureSimilaritySearchReadConnection=Server=database-server;Port=5432;Database=csd-database;User Id=postgres;Password=${CSD_DB_PASSWORD};SearchPath=similarity
 
   ccdc-csd-fingerprint:
     labels:
       <<: *k8s-labels
-    image: ccdcrepository.azurecr.io/ccdc-csd-fingerprint-service:0.1.9
+    image: ccdcrepository.azurecr.io/ccdc-csd-fingerprint-service:0.1.16
     expose:
       - 80
 
   ccdc-csd-substructure-filter:
     labels:
       <<: *k8s-labels
-    image: ccdcrepository.azurecr.io/ccdc-csd-substructure-filter-service:0.1.9
+    image: ccdcrepository.azurecr.io/ccdc-csd-substructure-filter-service:0.1.16
     expose:
       - 80
 
   ccdc-csd-crystal-structure-export:
     labels:
       <<: *k8s-labels
-    image: ccdcrepository.azurecr.io/ccdc-csd-crystal-structure-export-service:0.1.9
+    image: ccdcrepository.azurecr.io/ccdc-csd-crystal-structure-export-service:0.1.16
     expose:
       - 80
 
   ccdc-csd-reducedcell-calculation-service:
     labels:
       <<: *k8s-labels
-    image: ccdcrepository.azurecr.io/ccdc-csd-reducedcell-calculation-service:0.1.9
+    image: ccdcrepository.azurecr.io/ccdc-csd-reducedcell-calculation-service:0.1.16
     expose:
       - 80