Skip to content

Commit faa351c

Browse files
thomaspleasancethomaspleasance
authored
Merge pull request #53 from ccdc-opensource/WCSD-3443-1
WCSD-3443 Release Update 2.1.0
2 parents 90d98c3 + 87dc252 commit faa351c

File tree

2 files changed

+32
-32
lines changed

2 files changed

+32
-32
lines changed

‎docker-compose.macromolecule-hub.yml

+16-16
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ services:
1212
depends_on:
1313
- ccdc-csd-searchservice
1414
- csd-request-entry
15-
image: ccdcrepository.azurecr.io/onsite/webcsd:2.0.8
15+
image: ccdcrepository.azurecr.io/onsite/webcsd:2.1.0
1616
ports:
1717
- 80:80
1818
volumes:
@@ -26,7 +26,7 @@ services:
2626
depends_on:
2727
- ccdc-csd-searchservice
2828
- csd-request-entry
29-
image: ccdcrepository.azurecr.io/onsite/webcsdbackend:2.0.8
29+
image: ccdcrepository.azurecr.io/onsite/webcsdbackend:2.1.0
3030
environment:
3131
- ServiceSettings__StructureInfoLocation=/csd-data/structure-links.csv
3232
- CCDC_LICENSING_CONFIGURATION=${CCDC_LICENSING_CONFIGURATION}
@@ -67,7 +67,7 @@ services:
6767
ccdc-csd-substructuresearch:
6868
labels:
6969
<<: *k8s-labels
70-
image: ccdcrepository.azurecr.io/onsite/ccdc-csd-substructuresearch-api:2.0.8
70+
image: ccdcrepository.azurecr.io/onsite/ccdc-csd-substructuresearch-api:2.1.0
7171
depends_on:
7272
- database-server
7373
- ccdc-csd-resultstore
@@ -85,7 +85,7 @@ services:
8585
ccdc-csd-deposition:
8686
labels:
8787
<<: *k8s-labels
88-
image: ccdcrepository.azurecr.io/onsite/ccdc-csd-deposition-api:2.0.8
88+
image: ccdcrepository.azurecr.io/onsite/ccdc-csd-deposition-api:2.1.0
8989
depends_on:
9090
- database-server
9191
environment:
@@ -101,7 +101,7 @@ services:
101101
<<: *k8s-labels
102102
depends_on:
103103
- database-server
104-
image: ccdcrepository.azurecr.io/onsite/ccdc-csd-textnumericsearch-api:2.0.8
104+
image: ccdcrepository.azurecr.io/onsite/ccdc-csd-textnumericsearch-api:2.1.0
105105
environment:
106106
- CsdReadConnection=Server=database-server;Port=5432;Database=csd-database;User Id=postgres;Password=${CSD_DB_PASSWORD};SearchPath=csd_schema
107107
- PdbReadConnection=Server=database-server;Port=5432;Database=csd-database;User Id=postgres;Password=${CSD_DB_PASSWORD};SearchPath=pdb_schema
@@ -118,7 +118,7 @@ services:
118118
- ccdc-csd-substructuresearch
119119
- ccdc-csd-resultstore
120120
- ccdc-csd-similaritysearch
121-
image: ccdcrepository.azurecr.io/onsite/ccdc-csd-searchservice-api:2.0.8
121+
image: ccdcrepository.azurecr.io/onsite/ccdc-csd-searchservice-api:2.1.0
122122
expose:
123123
- 80
124124

@@ -128,7 +128,7 @@ services:
128128
depends_on:
129129
- ccdc-csd-deposition
130130
- ccdc-csd-crystal-structure-export
131-
image: ccdcrepository.azurecr.io/onsite/csd-request-entry-api:2.0.8
131+
image: ccdcrepository.azurecr.io/onsite/csd-request-entry-api:2.1.0
132132
expose:
133133
- 80
134134

@@ -137,7 +137,7 @@ services:
137137
<<: *k8s-labels
138138
depends_on:
139139
- database-server
140-
image: ccdcrepository.azurecr.io/onsite/ccdc-csd-formulasearch-api:2.0.8
140+
image: ccdcrepository.azurecr.io/onsite/ccdc-csd-formulasearch-api:2.1.0
141141
environment:
142142
- FormulaSearchReadConnection=Server=database-server;Port=5432;Database=csd-database;User Id=postgres;Password=${CSD_DB_PASSWORD};SearchPath=formula
143143
expose:
@@ -149,7 +149,7 @@ services:
149149
depends_on:
150150
- database-server
151151
- ccdc-csd-reducedcell-calculation-service
152-
image: ccdcrepository.azurecr.io/onsite/ccdc-csd-unit-cell-search:2.0.8
152+
image: ccdcrepository.azurecr.io/onsite/ccdc-csd-unit-cell-search:2.1.0
153153
environment:
154154
- UnitCellSearchReadConnection=Server=database-server;Port=5432;Database=csd-database;User Id=postgres;Password=${CSD_DB_PASSWORD};SearchPath=unitcell
155155
- UnitCellPdbReadConnection=Server=database-server;Port=5432;Database=csd-database;User Id=postgres;Password=${CSD_DB_PASSWORD};SearchPath=pdb_cell_optimisation
@@ -161,7 +161,7 @@ services:
161161
ccdc-csd-resultstore:
162162
labels:
163163
<<: *k8s-labels
164-
image: ccdcrepository.azurecr.io/onsite/ccdc-csd-resultstore-api:2.0.8
164+
image: ccdcrepository.azurecr.io/onsite/ccdc-csd-resultstore-api:2.1.0
165165
environment:
166166
- OrderedCachePassword=${CSD_CACHE_PASSWORD}
167167
expose:
@@ -171,46 +171,46 @@ services:
171171
depends_on:
172172
- database-server
173173
- ccdc-csd-fingerprint
174-
image: ccdcrepository.azurecr.io/onsite/ccdc-csd-structure-similarity-search:2.0.8
174+
image: ccdcrepository.azurecr.io/onsite/ccdc-csd-structure-similarity-search:2.1.0
175175
environment:
176176
- StructureSimilaritySearchReadConnection=Server=database-server;Port=5432;Database=csd-database;User Id=postgres;Password=${CSD_DB_PASSWORD};SearchPath=similarity
177177

178178
ccdc-csd-fingerprint:
179179
labels:
180180
<<: *k8s-labels
181-
image: ccdcrepository.azurecr.io/onsite/ccdc-csd-fingerprint-service:2.0.8
181+
image: ccdcrepository.azurecr.io/onsite/ccdc-csd-fingerprint-service:2.1.0
182182
expose:
183183
- 80
184184
restart: unless-stopped
185185

186186
ccdc-csd-substructure-filter:
187187
labels:
188188
<<: *k8s-labels
189-
image: ccdcrepository.azurecr.io/onsite/ccdc-csd-substructure-filter-service:2.0.8
189+
image: ccdcrepository.azurecr.io/onsite/ccdc-csd-substructure-filter-service:2.1.0
190190
expose:
191191
- 80
192192
restart: unless-stopped
193193

194194
ccdc-csd-crystal-structure-export:
195195
labels:
196196
<<: *k8s-labels
197-
image: ccdcrepository.azurecr.io/onsite/ccdc-csd-crystal-structure-export-service:2.0.8
197+
image: ccdcrepository.azurecr.io/onsite/ccdc-csd-crystal-structure-export-service:2.1.0
198198
expose:
199199
- 80
200200
restart: unless-stopped
201201

202202
ccdc-csd-reducedcell-calculation-service:
203203
labels:
204204
<<: *k8s-labels
205-
image: ccdcrepository.azurecr.io/onsite/ccdc-csd-reducedcell-calculation-service:2.0.8
205+
image: ccdcrepository.azurecr.io/onsite/ccdc-csd-reducedcell-calculation-service:2.1.0
206206
expose:
207207
- 80
208208
restart: unless-stopped
209209

210210
webcsd-theory:
211211
labels:
212212
<<: *k8s-labels
213-
image: ccdcrepository.azurecr.io/onsite/csd-theory:2.0.8
213+
image: ccdcrepository.azurecr.io/onsite/csd-theory:2.1.0
214214
environment:
215215
- CCDC_LICENSING_CONFIGURATION=${CCDC_LICENSING_CONFIGURATION}
216216
expose:

‎docker-compose.yml

+16-16
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ services:
1111
depends_on:
1212
- ccdc-csd-searchservice
1313
- csd-request-entry
14-
image: ccdcrepository.azurecr.io/onsite/webcsd:2.0.8
14+
image: ccdcrepository.azurecr.io/onsite/webcsd:2.1.0
1515
ports:
1616
- 80:80
1717
volumes:
@@ -25,7 +25,7 @@ services:
2525
depends_on:
2626
- ccdc-csd-searchservice
2727
- csd-request-entry
28-
image: ccdcrepository.azurecr.io/onsite/webcsdbackend:2.0.8
28+
image: ccdcrepository.azurecr.io/onsite/webcsdbackend:2.1.0
2929
environment:
3030
- ServiceSettings__StructureInfoLocation=/csd-data/structure-links.csv
3131
- CCDC_LICENSING_CONFIGURATION=${CCDC_LICENSING_CONFIGURATION}
@@ -63,7 +63,7 @@ services:
6363
ccdc-csd-substructuresearch:
6464
labels:
6565
<<: *k8s-labels
66-
image: ccdcrepository.azurecr.io/onsite/ccdc-csd-substructuresearch-api:2.0.8
66+
image: ccdcrepository.azurecr.io/onsite/ccdc-csd-substructuresearch-api:2.1.0
6767
depends_on:
6868
- database-server
6969
- ccdc-csd-resultstore
@@ -78,7 +78,7 @@ services:
7878
ccdc-csd-deposition:
7979
labels:
8080
<<: *k8s-labels
81-
image: ccdcrepository.azurecr.io/onsite/ccdc-csd-deposition-api:2.0.8
81+
image: ccdcrepository.azurecr.io/onsite/ccdc-csd-deposition-api:2.1.0
8282
depends_on:
8383
- database-server
8484
environment:
@@ -91,7 +91,7 @@ services:
9191
<<: *k8s-labels
9292
depends_on:
9393
- database-server
94-
image: ccdcrepository.azurecr.io/onsite/ccdc-csd-textnumericsearch-api:2.0.8
94+
image: ccdcrepository.azurecr.io/onsite/ccdc-csd-textnumericsearch-api:2.1.0
9595
environment:
9696
- CsdReadConnection=Server=database-server;Port=5432;Database=csd-database;User Id=postgres;Password=${CSD_DB_PASSWORD};SearchPath=csd_schema
9797
expose:
@@ -105,7 +105,7 @@ services:
105105
- ccdc-csd-substructuresearch
106106
- ccdc-csd-resultstore
107107
- ccdc-csd-similaritysearch
108-
image: ccdcrepository.azurecr.io/onsite/ccdc-csd-searchservice-api:2.0.8
108+
image: ccdcrepository.azurecr.io/onsite/ccdc-csd-searchservice-api:2.1.0
109109
expose:
110110
- 80
111111

@@ -115,7 +115,7 @@ services:
115115
depends_on:
116116
- ccdc-csd-deposition
117117
- ccdc-csd-crystal-structure-export
118-
image: ccdcrepository.azurecr.io/onsite/csd-request-entry-api:2.0.8
118+
image: ccdcrepository.azurecr.io/onsite/csd-request-entry-api:2.1.0
119119
expose:
120120
- 80
121121

@@ -124,7 +124,7 @@ services:
124124
<<: *k8s-labels
125125
depends_on:
126126
- database-server
127-
image: ccdcrepository.azurecr.io/onsite/ccdc-csd-formulasearch-api:2.0.8
127+
image: ccdcrepository.azurecr.io/onsite/ccdc-csd-formulasearch-api:2.1.0
128128
environment:
129129
- FormulaSearchReadConnection=Server=database-server;Port=5432;Database=csd-database;User Id=postgres;Password=${CSD_DB_PASSWORD};SearchPath=formula
130130
expose:
@@ -136,7 +136,7 @@ services:
136136
depends_on:
137137
- database-server
138138
- ccdc-csd-reducedcell-calculation-service
139-
image: ccdcrepository.azurecr.io/onsite/ccdc-csd-unit-cell-search:2.0.8
139+
image: ccdcrepository.azurecr.io/onsite/ccdc-csd-unit-cell-search:2.1.0
140140
environment:
141141
- UnitCellSearchReadConnection=Server=database-server;Port=5432;Database=csd-database;User Id=postgres;Password=${CSD_DB_PASSWORD};SearchPath=unitcell
142142
expose:
@@ -145,7 +145,7 @@ services:
145145
ccdc-csd-resultstore:
146146
labels:
147147
<<: *k8s-labels
148-
image: ccdcrepository.azurecr.io/onsite/ccdc-csd-resultstore-api:2.0.8
148+
image: ccdcrepository.azurecr.io/onsite/ccdc-csd-resultstore-api:2.1.0
149149
environment:
150150
- OrderedCachePassword=${CSD_CACHE_PASSWORD}
151151
expose:
@@ -155,46 +155,46 @@ services:
155155
depends_on:
156156
- database-server
157157
- ccdc-csd-fingerprint
158-
image: ccdcrepository.azurecr.io/onsite/ccdc-csd-structure-similarity-search:2.0.8
158+
image: ccdcrepository.azurecr.io/onsite/ccdc-csd-structure-similarity-search:2.1.0
159159
environment:
160160
- StructureSimilaritySearchReadConnection=Server=database-server;Port=5432;Database=csd-database;User Id=postgres;Password=${CSD_DB_PASSWORD};SearchPath=similarity
161161

162162
ccdc-csd-fingerprint:
163163
labels:
164164
<<: *k8s-labels
165-
image: ccdcrepository.azurecr.io/onsite/ccdc-csd-fingerprint-service:2.0.8
165+
image: ccdcrepository.azurecr.io/onsite/ccdc-csd-fingerprint-service:2.1.0
166166
expose:
167167
- 80
168168
restart: unless-stopped
169169

170170
ccdc-csd-substructure-filter:
171171
labels:
172172
<<: *k8s-labels
173-
image: ccdcrepository.azurecr.io/onsite/ccdc-csd-substructure-filter-service:2.0.8
173+
image: ccdcrepository.azurecr.io/onsite/ccdc-csd-substructure-filter-service:2.1.0
174174
expose:
175175
- 80
176176
restart: unless-stopped
177177

178178
ccdc-csd-crystal-structure-export:
179179
labels:
180180
<<: *k8s-labels
181-
image: ccdcrepository.azurecr.io/onsite/ccdc-csd-crystal-structure-export-service:2.0.8
181+
image: ccdcrepository.azurecr.io/onsite/ccdc-csd-crystal-structure-export-service:2.1.0
182182
expose:
183183
- 80
184184
restart: unless-stopped
185185

186186
ccdc-csd-reducedcell-calculation-service:
187187
labels:
188188
<<: *k8s-labels
189-
image: ccdcrepository.azurecr.io/onsite/ccdc-csd-reducedcell-calculation-service:2.0.8
189+
image: ccdcrepository.azurecr.io/onsite/ccdc-csd-reducedcell-calculation-service:2.1.0
190190
expose:
191191
- 80
192192
restart: unless-stopped
193193

194194
webcsd-theory:
195195
labels:
196196
<<: *k8s-labels
197-
image: ccdcrepository.azurecr.io/onsite/csd-theory:2.0.8
197+
image: ccdcrepository.azurecr.io/onsite/csd-theory:2.1.0
198198
environment:
199199
- CCDC_LICENSING_CONFIGURATION=${CCDC_LICENSING_CONFIGURATION}
200200
expose:

0 commit comments

Comments
 (0)