Skip to content

Commit 4a30a0f

Browse files
AlexRajyaAlexRajya
committed
WCSD-3452 Fix for port config bug
1 parent faa351c commit 4a30a0f

4 files changed

+82
-138
lines changed

‎docker-compose.macromolecule-hub.yml

+1-29
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ services:
1414
- csd-request-entry
1515
image: ccdcrepository.azurecr.io/onsite/webcsd:2.1.0
1616
ports:
17-
- 80:80
17+
- ${WEBCSD_PORT}:${WEBCSD_PORT}
1818
volumes:
1919
- ./userdata:/app/OnSite
2020
labels:
@@ -35,8 +35,6 @@ services:
3535
- ServiceSettings__Databases__1__ConnectionString=dbe
3636
labels:
3737
<<: *k8s-labels
38-
expose:
39-
- 80
4038

4139
redis:
4240
labels:
@@ -79,8 +77,6 @@ services:
7977
- PdbReadConnection=Server=database-server;Port=5432;Database=csd-database;User Id=postgres;Password=${CSD_DB_PASSWORD};SearchPath=structure_optimisation
8078
- SubstructureSearchDatabaseConfiguration__Databases__1__Name=pdb
8179
- SubstructureSearchDatabaseConfiguration__Databases__1__SettingsKey=PdbReadConnection
82-
expose:
83-
- 80
8480

8581
ccdc-csd-deposition:
8682
labels:
@@ -93,8 +89,6 @@ services:
9389
- DepositionPdbReadConnection=Server=database-server;Port=5432;Database=csd-database;User Id=postgres;Password=${CSD_DB_PASSWORD};SearchPath=pdb_schema
9490
- DatabaseConfiguration__Databases__1__Name=pdb
9591
- DatabaseConfiguration__Databases__1__SettingsKey=DepositionPdbReadConnection
96-
expose:
97-
- 80
9892

9993
ccdc-csd-textnumericsearch:
10094
labels:
@@ -107,8 +101,6 @@ services:
107101
- PdbReadConnection=Server=database-server;Port=5432;Database=csd-database;User Id=postgres;Password=${CSD_DB_PASSWORD};SearchPath=pdb_schema
108102
- DatabaseConfiguration__Databases__1__Name=pdb
109103
- DatabaseConfiguration__Databases__1__SettingsKey=PdbReadConnection
110-
expose:
111-
- 80
112104

113105
ccdc-csd-searchservice:
114106
labels:
@@ -119,8 +111,6 @@ services:
119111
- ccdc-csd-resultstore
120112
- ccdc-csd-similaritysearch
121113
image: ccdcrepository.azurecr.io/onsite/ccdc-csd-searchservice-api:2.1.0
122-
expose:
123-
- 80
124114

125115
csd-request-entry:
126116
labels:
@@ -129,8 +119,6 @@ services:
129119
- ccdc-csd-deposition
130120
- ccdc-csd-crystal-structure-export
131121
image: ccdcrepository.azurecr.io/onsite/csd-request-entry-api:2.1.0
132-
expose:
133-
- 80
134122

135123
ccdc-csd-formulasearch:
136124
labels:
@@ -140,8 +128,6 @@ services:
140128
image: ccdcrepository.azurecr.io/onsite/ccdc-csd-formulasearch-api:2.1.0
141129
environment:
142130
- FormulaSearchReadConnection=Server=database-server;Port=5432;Database=csd-database;User Id=postgres;Password=${CSD_DB_PASSWORD};SearchPath=formula
143-
expose:
144-
- 80
145131

146132
ccdc-csd-unitcellsearch:
147133
labels:
@@ -155,17 +141,13 @@ services:
155141
- UnitCellPdbReadConnection=Server=database-server;Port=5432;Database=csd-database;User Id=postgres;Password=${CSD_DB_PASSWORD};SearchPath=pdb_cell_optimisation
156142
- DatabaseConfiguration__Databases__1__Name=pdb
157143
- DatabaseConfiguration__Databases__1__SettingsKey=UnitCellPdbReadConnection
158-
expose:
159-
- 80
160144

161145
ccdc-csd-resultstore:
162146
labels:
163147
<<: *k8s-labels
164148
image: ccdcrepository.azurecr.io/onsite/ccdc-csd-resultstore-api:2.1.0
165149
environment:
166150
- OrderedCachePassword=${CSD_CACHE_PASSWORD}
167-
expose:
168-
- 80
169151

170152
ccdc-csd-similaritysearch:
171153
depends_on:
@@ -179,32 +161,24 @@ services:
179161
labels:
180162
<<: *k8s-labels
181163
image: ccdcrepository.azurecr.io/onsite/ccdc-csd-fingerprint-service:2.1.0
182-
expose:
183-
- 80
184164
restart: unless-stopped
185165

186166
ccdc-csd-substructure-filter:
187167
labels:
188168
<<: *k8s-labels
189169
image: ccdcrepository.azurecr.io/onsite/ccdc-csd-substructure-filter-service:2.1.0
190-
expose:
191-
- 80
192170
restart: unless-stopped
193171

194172
ccdc-csd-crystal-structure-export:
195173
labels:
196174
<<: *k8s-labels
197175
image: ccdcrepository.azurecr.io/onsite/ccdc-csd-crystal-structure-export-service:2.1.0
198-
expose:
199-
- 80
200176
restart: unless-stopped
201177

202178
ccdc-csd-reducedcell-calculation-service:
203179
labels:
204180
<<: *k8s-labels
205181
image: ccdcrepository.azurecr.io/onsite/ccdc-csd-reducedcell-calculation-service:2.1.0
206-
expose:
207-
- 80
208182
restart: unless-stopped
209183

210184
webcsd-theory:
@@ -213,8 +187,6 @@ services:
213187
image: ccdcrepository.azurecr.io/onsite/csd-theory:2.1.0
214188
environment:
215189
- CCDC_LICENSING_CONFIGURATION=${CCDC_LICENSING_CONFIGURATION}
216-
expose:
217-
- 80
218190

219191
volumes:
220192
csd_data: {}

‎docker-compose.port-configuration.yml

+77-80
Original file line numberDiff line numberDiff line change
@@ -3,33 +3,30 @@ version: "3.6"
33
services:
44
webcsd:
55
environment:
6-
- CsdRepository__SearchServiceLocation=http://ccdc-csd-searchservice:8080/
7-
- CsdRepository__PagedResultLocation=http://ccdc-csd-searchservice:8080/
8-
- CsdRepository__RequestEntriesServiceLocation=http://csd-request-entry:8080/
9-
- CsdRepository__ChemicalDiagramImageLocation=http://csd-request-entry:8080/
10-
- CsdRepository__ChemicalStructureMol2Location=http://csd-request-entry:8080/
11-
- CsdRepository__AtomEquivalencesLocation=http://csd-request-entry:8080/
12-
- CsdRepository__FormulaSearchServiceLocation=http://ccdc-csd-searchservice:8080/
13-
- CsdRepository__StructureSimilaritySearchServiceLocation=http://ccdc-csd-searchservice:8080/
14-
- CsdRepository__UnitCellSearchLocation=http://ccdc-csd-searchservice:8080/
15-
- CsdRepository__ServiceLocation=webcsdbackend:8080
16-
- ASPNETCORE_URLS=http://+:8080
17-
- CspRepository__ServiceLocation=webcsd-theory:8080
18-
19-
ports:
20-
- 8080:8080
21-
expose:
22-
- 8080
6+
- CsdRepository__SearchServiceLocation=http://ccdc-csd-searchservice:${WEBCSD_PORT}/
7+
- CsdRepository__PagedResultLocation=http://ccdc-csd-searchservice:${WEBCSD_PORT}/
8+
- CsdRepository__RequestEntriesServiceLocation=http://csd-request-entry:${WEBCSD_PORT}/
9+
- CsdRepository__ChemicalDiagramImageLocation=http://csd-request-entry:${WEBCSD_PORT}/
10+
- CsdRepository__ChemicalStructureMol2Location=http://csd-request-entry:${WEBCSD_PORT}/
11+
- CsdRepository__AtomEquivalencesLocation=http://csd-request-entry:${WEBCSD_PORT}/
12+
- CsdRepository__FormulaSearchServiceLocation=http://ccdc-csd-searchservice:${WEBCSD_PORT}/
13+
- CsdRepository__StructureSimilaritySearchServiceLocation=http://ccdc-csd-searchservice:${WEBCSD_PORT}/
14+
- CsdRepository__UnitCellSearchLocation=http://ccdc-csd-searchservice:${WEBCSD_PORT}/
15+
- CsdRepository__ServiceLocation=webcsdbackend:${WEBCSD_PORT}
16+
- ASPNETCORE_URLS=http://+:${WEBCSD_PORT}
17+
- CspRepository__ServiceLocation=webcsd-theory:${WEBCSD_PORT}
18+
expose:
19+
- ${WEBCSD_PORT}
2320
healthcheck:
24-
test: "curl --fail --silent --show-error --connect-timeout 5 --max-time 5 http://localhost:8080/health/ready"
21+
test: "curl --fail --silent --show-error --connect-timeout 5 --max-time 5 http://localhost:${WEBCSD_PORT}/health/ready"
2522

2623
webcsdbackend:
2724
environment:
28-
- ASPNETCORE_URLS=http://+:8080
25+
- ASPNETCORE_URLS=http://+:${WEBCSD_PORT}
2926
expose:
30-
- 8080
27+
- ${WEBCSD_PORT}
3128
healthcheck:
32-
test: "curl --fail --silent --show-error --connect-timeout 5 --max-time 5 http://localhost:8080/health/ready"
29+
test: "curl --fail --silent --show-error --connect-timeout 5 --max-time 5 http://localhost:${WEBCSD_PORT}/health/ready"
3330

3431
redis:
3532
expose:
@@ -41,128 +38,128 @@ services:
4138

4239
ccdc-csd-substructuresearch:
4340
environment:
44-
- FingerprintCalculationService=http://ccdc-csd-fingerprint:8080
45-
- ResultsStoreService=http://ccdc-csd-resultstore:8080
46-
- DepositionService=http://ccdc-csd-deposition:8080
47-
- SubstructureFilterService=http://ccdc-csd-substructure-filter:8080
48-
- ASPNETCORE_URLS=http://+:8080
41+
- FingerprintCalculationService=http://ccdc-csd-fingerprint:${WEBCSD_PORT}
42+
- ResultsStoreService=http://ccdc-csd-resultstore:${WEBCSD_PORT}
43+
- DepositionService=http://ccdc-csd-deposition:${WEBCSD_PORT}
44+
- SubstructureFilterService=http://ccdc-csd-substructure-filter:${WEBCSD_PORT}
45+
- ASPNETCORE_URLS=http://+:${WEBCSD_PORT}
4946
expose:
50-
- 8080
47+
- ${WEBCSD_PORT}
5148
healthcheck:
52-
test: "curl --fail --silent --show-error --connect-timeout 5 --max-time 5 http://localhost:8080/health/ready"
49+
test: "curl --fail --silent --show-error --connect-timeout 5 --max-time 5 http://localhost:${WEBCSD_PORT}/health/ready"
5350

5451
ccdc-csd-deposition:
5552
environment:
56-
- ASPNETCORE_URLS=http://+:8080
53+
- ASPNETCORE_URLS=http://+:${WEBCSD_PORT}
5754
expose:
58-
- 8080
55+
- ${WEBCSD_PORT}
5956
healthcheck:
60-
test: "curl --fail --silent --show-error --connect-timeout 5 --max-time 5 http://localhost:8080/health/ready"
57+
test: "curl --fail --silent --show-error --connect-timeout 5 --max-time 5 http://localhost:${WEBCSD_PORT}/health/ready"
6158

6259

6360
ccdc-csd-textnumericsearch:
6461
environment:
65-
- ASPNETCORE_URLS=http://+:8080
62+
- ASPNETCORE_URLS=http://+:${WEBCSD_PORT}
6663
expose:
67-
- 8080
64+
- ${WEBCSD_PORT}
6865
healthcheck:
69-
test: "curl --fail --silent --show-error --connect-timeout 5 --max-time 5 http://localhost:8080/health/ready"
66+
test: "curl --fail --silent --show-error --connect-timeout 5 --max-time 5 http://localhost:${WEBCSD_PORT}/health/ready"
7067

7168
ccdc-csd-searchservice:
7269
environment:
73-
- TextNumericSearchService=http://ccdc-csd-textnumericsearch:8080/
74-
- SubstructureSearchService=http://ccdc-csd-substructuresearch:8080/
75-
- QueryIdGeneratorService=http://ccdc-csd-resultstore:8080/
76-
- PagedResultsService=http://ccdc-csd-resultstore:8080/
77-
- FormulaSearchService=http://ccdc-csd-formulasearch:8080/
78-
- StructureSimilaritySearchService=http://ccdc-csd-similaritysearch:8080/
79-
- UnitCellSearchService=http://ccdc-csd-unitcellsearch:8080/
80-
- ASPNETCORE_URLS=http://+:8080
81-
expose:
82-
- 8080
70+
- TextNumericSearchService=http://ccdc-csd-textnumericsearch:${WEBCSD_PORT}/
71+
- SubstructureSearchService=http://ccdc-csd-substructuresearch:${WEBCSD_PORT}/
72+
- QueryIdGeneratorService=http://ccdc-csd-resultstore:${WEBCSD_PORT}/
73+
- PagedResultsService=http://ccdc-csd-resultstore:${WEBCSD_PORT}/
74+
- FormulaSearchService=http://ccdc-csd-formulasearch:${WEBCSD_PORT}/
75+
- StructureSimilaritySearchService=http://ccdc-csd-similaritysearch:${WEBCSD_PORT}/
76+
- UnitCellSearchService=http://ccdc-csd-unitcellsearch:${WEBCSD_PORT}/
77+
- ASPNETCORE_URLS=http://+:${WEBCSD_PORT}
78+
expose:
79+
- ${WEBCSD_PORT}
8380
healthcheck:
84-
test: "curl --fail --silent --show-error --connect-timeout 5 --max-time 5 http://localhost:8080/health/ready"
81+
test: "curl --fail --silent --show-error --connect-timeout 5 --max-time 5 http://localhost:${WEBCSD_PORT}/health/ready"
8582

8683
csd-request-entry:
8784
environment:
88-
- CrystalStructureExportService=http://ccdc-csd-crystal-structure-export:8080
89-
- DepositionService=http://ccdc-csd-deposition:8080
90-
- ASPNETCORE_URLS=http://+:8080
85+
- CrystalStructureExportService=http://ccdc-csd-crystal-structure-export:${WEBCSD_PORT}
86+
- DepositionService=http://ccdc-csd-deposition:${WEBCSD_PORT}
87+
- ASPNETCORE_URLS=http://+:${WEBCSD_PORT}
9188
expose:
92-
- 8080
89+
- ${WEBCSD_PORT}
9390
healthcheck:
94-
test: "curl --fail --silent --show-error --connect-timeout 5 --max-time 5 http://localhost:8080/health/ready"
91+
test: "curl --fail --silent --show-error --connect-timeout 5 --max-time 5 http://localhost:${WEBCSD_PORT}/health/ready"
9592

9693
ccdc-csd-formulasearch:
9794
environment:
98-
- ASPNETCORE_URLS=http://+:8080
95+
- ASPNETCORE_URLS=http://+:${WEBCSD_PORT}
9996
expose:
100-
- 8080
97+
- ${WEBCSD_PORT}
10198
healthcheck:
102-
test: "curl --fail --silent --show-error --connect-timeout 5 --max-time 5 http://localhost:8080/health/ready"
99+
test: "curl --fail --silent --show-error --connect-timeout 5 --max-time 5 http://localhost:${WEBCSD_PORT}/health/ready"
103100

104101
ccdc-csd-unitcellsearch:
105102
environment:
106-
- UnitCellNiggliReducedCellCalculationService=http://ccdc-csd-reducedcell-calculation-service:8080
107-
- UnitCellReducedCellCalculationService=http://ccdc-csd-reducedcell-calculation-service:8080
108-
- ASPNETCORE_URLS=http://+:8080
103+
- UnitCellNiggliReducedCellCalculationService=http://ccdc-csd-reducedcell-calculation-service:${WEBCSD_PORT}
104+
- UnitCellReducedCellCalculationService=http://ccdc-csd-reducedcell-calculation-service:${WEBCSD_PORT}
105+
- ASPNETCORE_URLS=http://+:${WEBCSD_PORT}
109106
expose:
110-
- 8080
107+
- ${WEBCSD_PORT}
111108
healthcheck:
112-
test: "curl --fail --silent --show-error --connect-timeout 5 --max-time 5 http://localhost:8080/health/ready"
109+
test: "curl --fail --silent --show-error --connect-timeout 5 --max-time 5 http://localhost:${WEBCSD_PORT}/health/ready"
113110

114111
ccdc-csd-resultstore:
115112
environment:
116-
- ASPNETCORE_URLS=http://+:8080
113+
- ASPNETCORE_URLS=http://+:${WEBCSD_PORT}
117114
expose:
118-
- 8080
115+
- ${WEBCSD_PORT}
119116
healthcheck:
120-
test: "curl --fail --silent --show-error --connect-timeout 5 --max-time 5 http://localhost:8080/health/ready"
117+
test: "curl --fail --silent --show-error --connect-timeout 5 --max-time 5 http://localhost:${WEBCSD_PORT}/health/ready"
121118

122119
ccdc-csd-similaritysearch:
123120
environment:
124-
- FingerprintChemicalDiagramCalculationService=http://ccdc-csd-fingerprint:8080
125-
- ASPNETCORE_URLS=http://+:8080
121+
- FingerprintChemicalDiagramCalculationService=http://ccdc-csd-fingerprint:${WEBCSD_PORT}
122+
- ASPNETCORE_URLS=http://+:${WEBCSD_PORT}
126123
expose:
127-
- 8080
124+
- ${WEBCSD_PORT}
128125
healthcheck:
129-
test: "curl --fail --silent --show-error --connect-timeout 5 --max-time 5 http://localhost:8080/health/ready"
126+
test: "curl --fail --silent --show-error --connect-timeout 5 --max-time 5 http://localhost:${WEBCSD_PORT}/health/ready"
130127

131128
ccdc-csd-substructure-filter:
132129
environment:
133-
- CCDC_SERVICE_PORT=8080
130+
- CCDC_SERVICE_PORT=${WEBCSD_PORT}
134131
expose:
135-
- 8080
132+
- ${WEBCSD_PORT}
136133
healthcheck:
137-
test: "curl --fail --silent --show-error --connect-timeout 5 --max-time 5 http://localhost:8080/health/ready"
134+
test: "curl --fail --silent --show-error --connect-timeout 5 --max-time 5 http://localhost:${WEBCSD_PORT}/health/ready"
138135

139136
ccdc-csd-crystal-structure-export:
140137
environment:
141-
- CCDC_SERVICE_PORT=8080
138+
- CCDC_SERVICE_PORT=${WEBCSD_PORT}
142139
expose:
143-
- 8080
140+
- ${WEBCSD_PORT}
144141
healthcheck:
145-
test: "curl --fail --silent --show-error --connect-timeout 5 --max-time 5 http://localhost:8080/health/ready"
142+
test: "curl --fail --silent --show-error --connect-timeout 5 --max-time 5 http://localhost:${WEBCSD_PORT}/health/ready"
146143

147144
ccdc-csd-reducedcell-calculation-service:
148145
environment:
149-
- CCDC_SERVICE_PORT=8080
146+
- CCDC_SERVICE_PORT=${WEBCSD_PORT}
150147
expose:
151-
- 8080
148+
- ${WEBCSD_PORT}
152149
healthcheck:
153-
test: "curl --fail --silent --show-error --connect-timeout 5 --max-time 5 http://localhost:8080/health/ready"
150+
test: "curl --fail --silent --show-error --connect-timeout 5 --max-time 5 http://localhost:${WEBCSD_PORT}/health/ready"
154151

155152
ccdc-csd-fingerprint:
156153
environment:
157-
- CCDC_SERVICE_PORT=8080
154+
- CCDC_SERVICE_PORT=${WEBCSD_PORT}
158155
expose:
159-
- 8080
156+
- ${WEBCSD_PORT}
160157
healthcheck:
161-
test: "curl --fail --silent --show-error --connect-timeout 5 --max-time 5 http://localhost:8080/health/ready"
158+
test: "curl --fail --silent --show-error --connect-timeout 5 --max-time 5 http://localhost:${WEBCSD_PORT}/health/ready"
162159

163160
webcsd-theory:
164161
environment:
165-
- ASPNETCORE_URLS=http://+:8080
166-
- ReportSettings__CspServerUrl=localhost:8080
162+
- ReportSettings__CspServerUrl=localhost:${WEBCSD_PORT}
163+
- ASPNETCORE_URLS=http://+:${WEBCSD_PORT}
167164
expose:
168-
- 8080
165+
- ${WEBCSD_PORT}

0 commit comments

Comments
 (0)