Merge pull request #55 from ccdc-opensource/WCSD-3452

WCSD-3452 Port configuration fix

Author: AlexRajya

docker-compose.macromolecule-hub.yml

@@ -12,9 +12,9 @@ services:
     depends_on:
       - ccdc-csd-searchservice
       - csd-request-entry
-    image: ccdcrepository.azurecr.io/onsite/webcsd:2.1.0
+    image: ccdcrepository.azurecr.io/onsite/webcsd:3.0.0
     ports:
-      - 80:80
+      - ${WEBCSD_PORT}:${WEBCSD_PORT}
     volumes:
       - ./userdata:/app/OnSite
     labels:
@@ -26,7 +26,7 @@ services:
     depends_on:
       - ccdc-csd-searchservice
       - csd-request-entry
-    image: ccdcrepository.azurecr.io/onsite/webcsdbackend:2.1.0
+    image: ccdcrepository.azurecr.io/onsite/webcsdbackend:3.0.0
     environment:
       - ServiceSettings__StructureInfoLocation=/csd-data/structure-links.csv
       - CCDC_LICENSING_CONFIGURATION=${CCDC_LICENSING_CONFIGURATION}
@@ -35,8 +35,6 @@ services:
       - ServiceSettings__Databases__1__ConnectionString=dbe
     labels:
       <<: *k8s-labels
-    expose:
-      - 80
 
   redis:
     labels:
@@ -67,7 +65,7 @@ services:
   ccdc-csd-substructuresearch:
     labels:
       <<: *k8s-labels
-    image: ccdcrepository.azurecr.io/onsite/ccdc-csd-substructuresearch-api:2.1.0
+    image: ccdcrepository.azurecr.io/onsite/ccdc-csd-substructuresearch-api:3.0.0
     depends_on:
       - database-server
       - ccdc-csd-resultstore
@@ -79,36 +77,30 @@ services:
       - PdbReadConnection=Server=database-server;Port=5432;Database=csd-database;User Id=postgres;Password=${CSD_DB_PASSWORD};SearchPath=structure_optimisation
       - SubstructureSearchDatabaseConfiguration__Databases__1__Name=pdb
       - SubstructureSearchDatabaseConfiguration__Databases__1__SettingsKey=PdbReadConnection
-    expose:
-      - 80
 
   ccdc-csd-deposition:
     labels:
       <<: *k8s-labels
-    image: ccdcrepository.azurecr.io/onsite/ccdc-csd-deposition-api:2.1.0
+    image: ccdcrepository.azurecr.io/onsite/ccdc-csd-deposition-api:3.0.0
     depends_on:
       - database-server
     environment:
       - CsdDepositionReadConnection=Server=database-server;Port=5432;Database=csd-database;User Id=postgres;Password=${CSD_DB_PASSWORD};SearchPath=csd_schema
       - DepositionPdbReadConnection=Server=database-server;Port=5432;Database=csd-database;User Id=postgres;Password=${CSD_DB_PASSWORD};SearchPath=pdb_schema
       - DatabaseConfiguration__Databases__1__Name=pdb
       - DatabaseConfiguration__Databases__1__SettingsKey=DepositionPdbReadConnection
-    expose:
-      - 80
 
   ccdc-csd-textnumericsearch:
     labels:
       <<: *k8s-labels
     depends_on:
       - database-server
-    image: ccdcrepository.azurecr.io/onsite/ccdc-csd-textnumericsearch-api:2.1.0
+    image: ccdcrepository.azurecr.io/onsite/ccdc-csd-textnumericsearch-api:3.0.0
     environment:
       - CsdReadConnection=Server=database-server;Port=5432;Database=csd-database;User Id=postgres;Password=${CSD_DB_PASSWORD};SearchPath=csd_schema
       - PdbReadConnection=Server=database-server;Port=5432;Database=csd-database;User Id=postgres;Password=${CSD_DB_PASSWORD};SearchPath=pdb_schema
       - DatabaseConfiguration__Databases__1__Name=pdb
       - DatabaseConfiguration__Databases__1__SettingsKey=PdbReadConnection
-    expose:
-      - 80
 
   ccdc-csd-searchservice:
     labels:
@@ -118,103 +110,83 @@ services:
       - ccdc-csd-substructuresearch
       - ccdc-csd-resultstore
       - ccdc-csd-similaritysearch
-    image: ccdcrepository.azurecr.io/onsite/ccdc-csd-searchservice-api:2.1.0
-    expose:
-      - 80
+    image: ccdcrepository.azurecr.io/onsite/ccdc-csd-searchservice-api:3.0.0
 
   csd-request-entry:
     labels:
       <<: *k8s-labels
     depends_on:
       - ccdc-csd-deposition
       - ccdc-csd-crystal-structure-export
-    image: ccdcrepository.azurecr.io/onsite/csd-request-entry-api:2.1.0
-    expose:
-      - 80
+    image: ccdcrepository.azurecr.io/onsite/csd-request-entry-api:3.0.0
 
   ccdc-csd-formulasearch:
     labels:
       <<: *k8s-labels
     depends_on:
       - database-server
-    image: ccdcrepository.azurecr.io/onsite/ccdc-csd-formulasearch-api:2.1.0
+    image: ccdcrepository.azurecr.io/onsite/ccdc-csd-formulasearch-api:3.0.0
     environment:
       - FormulaSearchReadConnection=Server=database-server;Port=5432;Database=csd-database;User Id=postgres;Password=${CSD_DB_PASSWORD};SearchPath=formula
-    expose:
-      - 80
 
   ccdc-csd-unitcellsearch:
     labels:
       <<: *k8s-labels
     depends_on:
       - database-server
       - ccdc-csd-reducedcell-calculation-service
-    image: ccdcrepository.azurecr.io/onsite/ccdc-csd-unit-cell-search:2.1.0
+    image: ccdcrepository.azurecr.io/onsite/ccdc-csd-unit-cell-search:3.0.0
     environment:
       - UnitCellSearchReadConnection=Server=database-server;Port=5432;Database=csd-database;User Id=postgres;Password=${CSD_DB_PASSWORD};SearchPath=unitcell
       - UnitCellPdbReadConnection=Server=database-server;Port=5432;Database=csd-database;User Id=postgres;Password=${CSD_DB_PASSWORD};SearchPath=pdb_cell_optimisation
       - DatabaseConfiguration__Databases__1__Name=pdb
       - DatabaseConfiguration__Databases__1__SettingsKey=UnitCellPdbReadConnection
-    expose:
-      - 80
 
   ccdc-csd-resultstore:
     labels:
       <<: *k8s-labels
-    image: ccdcrepository.azurecr.io/onsite/ccdc-csd-resultstore-api:2.1.0
+    image: ccdcrepository.azurecr.io/onsite/ccdc-csd-resultstore-api:3.0.0
     environment:
       - OrderedCachePassword=${CSD_CACHE_PASSWORD}
-    expose:
-      - 80
 
   ccdc-csd-similaritysearch:
     depends_on:
       - database-server
       - ccdc-csd-fingerprint
-    image: ccdcrepository.azurecr.io/onsite/ccdc-csd-structure-similarity-search:2.1.0
+    image: ccdcrepository.azurecr.io/onsite/ccdc-csd-structure-similarity-search:3.0.0
     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/onsite/ccdc-csd-fingerprint-service:2.1.0
-    expose:
-      - 80
+    image: ccdcrepository.azurecr.io/onsite/ccdc-csd-fingerprint-service:3.0.0
     restart: unless-stopped
 
   ccdc-csd-substructure-filter:
     labels:
       <<: *k8s-labels
-    image: ccdcrepository.azurecr.io/onsite/ccdc-csd-substructure-filter-service:2.1.0
-    expose:
-      - 80
+    image: ccdcrepository.azurecr.io/onsite/ccdc-csd-substructure-filter-service:3.0.0
     restart: unless-stopped
 
   ccdc-csd-crystal-structure-export:
     labels:
       <<: *k8s-labels
-    image: ccdcrepository.azurecr.io/onsite/ccdc-csd-crystal-structure-export-service:2.1.0
-    expose:
-      - 80
+    image: ccdcrepository.azurecr.io/onsite/ccdc-csd-crystal-structure-export-service:3.0.0
     restart: unless-stopped
 
   ccdc-csd-reducedcell-calculation-service:
     labels:
       <<: *k8s-labels
-    image: ccdcrepository.azurecr.io/onsite/ccdc-csd-reducedcell-calculation-service:2.1.0
-    expose:
-      - 80
+    image: ccdcrepository.azurecr.io/onsite/ccdc-csd-reducedcell-calculation-service:3.0.0
     restart: unless-stopped
 
   webcsd-theory:
     labels:
       <<: *k8s-labels
-    image: ccdcrepository.azurecr.io/onsite/csd-theory:2.1.0
+    image: ccdcrepository.azurecr.io/onsite/csd-theory:3.0.0
     environment:
       - CCDC_LICENSING_CONFIGURATION=${CCDC_LICENSING_CONFIGURATION}
-    expose:
-      - 80
 
 volumes:
   csd_data: {}