Skip to content

Commit 65fc04d

Browse files
authored
Merge pull request #22 from ccdc-opensource/CSD-5830
Service Increment for new functionality- Csd 5830
2 parents 21aa0d5 + 70c0ba2 commit 65fc04d

File tree

1 file changed

+24
-15
lines changed

1 file changed

+24
-15
lines changed

docker-compose.yml

+24-15
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/webcsd:0.1.6
14+
image: ccdcrepository.azurecr.io/webcsd:0.1.7
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/webcsdbackend:0.1.6
28+
image: ccdcrepository.azurecr.io/webcsdbackend:0.1.7
2929
environment:
3030
- ServiceSettings__StructureInfoLocation=/csd-data/structure-links.csv
3131
- CCDC_LICENSING_CONFIGURATION=${CCDC_LICENSING_CONFIGURATION}
@@ -46,7 +46,7 @@ services:
4646
database-server:
4747
labels:
4848
<<: *k8s-labels
49-
image: ccdcrepository.azurecr.io/csd-database:2022.1.0.alpha2
49+
image: ccdcrepository.azurecr.io/csd-database:2022.1.0.alpha3
5050
restart: always
5151
environment:
5252
- POSTGRES_PASSWORD=${CSD_DB_PASSWORD}
@@ -60,7 +60,7 @@ services:
6060
ccdc-csd-substructuresearch:
6161
labels:
6262
<<: *k8s-labels
63-
image: ccdcrepository.azurecr.io/ccdc-csd-substructuresearch:0.1.6
63+
image: ccdcrepository.azurecr.io/ccdc-csd-substructuresearch:0.1.7
6464
depends_on:
6565
- database-server
6666
- ccdc-csd-resultstore
@@ -75,7 +75,7 @@ services:
7575
ccdc-csd-deposition:
7676
labels:
7777
<<: *k8s-labels
78-
image: ccdcrepository.azurecr.io/ccdc-csd-deposition:0.1.6
78+
image: ccdcrepository.azurecr.io/ccdc-csd-deposition:0.1.7
7979
depends_on:
8080
- database-server
8181
environment:
@@ -88,7 +88,7 @@ services:
8888
<<: *k8s-labels
8989
depends_on:
9090
- database-server
91-
image: ccdcrepository.azurecr.io/ccdc-csd-textnumericsearch:0.1.6
91+
image: ccdcrepository.azurecr.io/ccdc-csd-textnumericsearch:0.1.7
9292
environment:
9393
- CsdReadConnection=Server=database-server;Port=5432;Database=csd-database;User Id=postgres;Password=${CSD_DB_PASSWORD};SearchPath=csd_schema
9494
expose:
@@ -101,7 +101,8 @@ services:
101101
- ccdc-csd-textnumericsearch
102102
- ccdc-csd-substructuresearch
103103
- ccdc-csd-resultstore
104-
image: ccdcrepository.azurecr.io/ccdc-csd-searchservice:0.1.6
104+
- ccdc-csd-similaritysearch
105+
image: ccdcrepository.azurecr.io/ccdc-csd-searchservice:0.1.7
105106
expose:
106107
- 80
107108

@@ -112,7 +113,7 @@ services:
112113
- ccdc-csd-deposition
113114
- ccdc-csd-crystal-structure-export
114115
- database-server
115-
image: ccdcrepository.azurecr.io/csd-request-entry:0.1.6
116+
image: ccdcrepository.azurecr.io/csd-request-entry:0.1.7
116117
environment:
117118
- CsdReadConnection=Server=database-server;Port=5432;Database=csd-database;User Id=postgres;Password=${CSD_DB_PASSWORD};SearchPath=csd_schema
118119
expose:
@@ -123,7 +124,7 @@ services:
123124
<<: *k8s-labels
124125
depends_on:
125126
- database-server
126-
image: ccdcrepository.azurecr.io/ccdc-csd-formulasearch:0.1.6
127+
image: ccdcrepository.azurecr.io/ccdc-csd-formulasearch:0.1.7
127128
environment:
128129
- FormulaSearchReadConnection=Server=database-server;Port=5432;Database=csd-database;User Id=postgres;Password=${CSD_DB_PASSWORD};SearchPath=formula
129130
expose:
@@ -135,7 +136,7 @@ services:
135136
depends_on:
136137
- database-server
137138
- ccdc-csd-reducedcell-calculation-service
138-
image: ccdcrepository.azurecr.io/ccdc-csd-unitcellsearch:0.1.6
139+
image: ccdcrepository.azurecr.io/ccdc-csd-unitcellsearch:0.1.7
139140
environment:
140141
- UnitCellSearchReadConnection=Server=database-server;Port=5432;Database=csd-database;User Id=postgres;Password=${CSD_DB_PASSWORD};SearchPath=unitcell
141142
expose:
@@ -144,37 +145,45 @@ services:
144145
ccdc-csd-resultstore:
145146
labels:
146147
<<: *k8s-labels
147-
image: ccdcrepository.azurecr.io/ccdc-csd-resultstore:0.1.6
148+
image: ccdcrepository.azurecr.io/ccdc-csd-resultstore:0.1.7
148149
environment:
149150
- OrderedCachePassword=${CSD_CACHE_PASSWORD}
150151
expose:
151152
- 80
152153

154+
ccdc-csd-similaritysearch:
155+
depends_on:
156+
- database-server
157+
- ccdc-csd-fingerprint
158+
image: ccdcrepository.azurecr.io/ccdc-csd-similaritysearch:0.1.7
159+
environment:
160+
- StructureSimilaritySearchReadConnection=Server=database-server;Port=5432;Database=csd-database;User Id=postgres;Password=${CSD_DB_PASSWORD};SearchPath=similarity
161+
153162
ccdc-csd-fingerprint:
154163
labels:
155164
<<: *k8s-labels
156-
image: ccdcrepository.azurecr.io/ccdc-csd-fingerprint-service:0.1.6
165+
image: ccdcrepository.azurecr.io/ccdc-csd-fingerprint-service:0.1.7
157166
expose:
158167
- 80
159168

160169
ccdc-csd-substructure-filter:
161170
labels:
162171
<<: *k8s-labels
163-
image: ccdcrepository.azurecr.io/ccdc-csd-substructure-filter-service:0.1.6
172+
image: ccdcrepository.azurecr.io/ccdc-csd-substructure-filter-service:0.1.7
164173
expose:
165174
- 80
166175

167176
ccdc-csd-crystal-structure-export:
168177
labels:
169178
<<: *k8s-labels
170-
image: ccdcrepository.azurecr.io/ccdc-csd-crystal-structure-export-service:0.1.6
179+
image: ccdcrepository.azurecr.io/ccdc-csd-crystal-structure-export-service:0.1.7
171180
expose:
172181
- 80
173182

174183
ccdc-csd-reducedcell-calculation-service:
175184
labels:
176185
<<: *k8s-labels
177-
image: ccdcrepository.azurecr.io/ccdc-csd-reducedcell-calculation-service:0.1.6
186+
image: ccdcrepository.azurecr.io/ccdc-csd-reducedcell-calculation-service:0.1.7
178187
expose:
179188
- 80
180189

0 commit comments

Comments
 (0)