Skip to content

Commit eb4b53f

Browse files
committed
test: added CRLs directory
1 parent b28943f commit eb4b53f

1 file changed

Lines changed: 30 additions & 7 deletions

File tree

tests/CI/docker-compose.yml

Lines changed: 30 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
volumes:
22
# Volume used to store the certificates of dirac
33
certs_data:
4+
# Volume used to store the crls of dirac
5+
crls_data:
46
# Volume used to store the config of diracx
57
diracx-cs-store:
68
# Volume used to store the pair of keys to sign the tokens
@@ -18,7 +20,13 @@ services:
1820
ports:
1921
- 3306:3306
2022
healthcheck:
21-
test: ["CMD", "sh", "-c", "${MYSQL_ADMIN_COMMAND} ping -h localhost > /tmp/health.log 2>&1;"]
23+
test:
24+
[
25+
"CMD",
26+
"sh",
27+
"-c",
28+
"${MYSQL_ADMIN_COMMAND} ping -h localhost > /tmp/health.log 2>&1;",
29+
]
2230
timeout: 20s
2331
retries: 10
2432
start_period: 60s
@@ -33,7 +41,8 @@ services:
3341
- 9200:9200
3442
env_file: "${ES_VER}.env"
3543
healthcheck:
36-
test: ["CMD", "curl", "-f", "-u", "elastic:changeme", "http://localhost:9200"]
44+
test:
45+
["CMD", "curl", "-f", "-u", "elastic:changeme", "http://localhost:9200"]
3746
interval: 5s
3847
timeout: 2s
3948
retries: 15
@@ -53,7 +62,13 @@ services:
5362
depends_on:
5463
- iam-init-keystore
5564
healthcheck:
56-
test: ["CMD", "curl", "-f", "http://localhost:8080/.well-known/openid-configuration"]
65+
test:
66+
[
67+
"CMD",
68+
"curl",
69+
"-f",
70+
"http://localhost:8080/.well-known/openid-configuration",
71+
]
5772
interval: 5s
5873
timeout: 2s
5974
retries: 15
@@ -116,6 +131,7 @@ services:
116131
container_name: dirac-init-certificates
117132
volumes:
118133
- certs_data:/ca/certs/
134+
- crls_data:/ca/crl/
119135
entrypoint: |
120136
/entrypoint.sh
121137
pull_policy: always
@@ -146,6 +162,7 @@ services:
146162
nofile: 8192
147163
volumes:
148164
- certs_data:/ca/certs
165+
- crls_data:/ca/crl/
149166
- diracx-cs-store:/cs_store
150167
- diracx-key-store:/keystore
151168
environment:
@@ -154,7 +171,6 @@ services:
154171
command: ["sleep", "infinity"] # This is necessary because of the issue described in https://github.com/moby/moby/issues/42275. What is added here is a hack/workaround.
155172
pull_policy: always
156173

157-
158174
dirac-client:
159175
platform: linux/amd64
160176
image: ${CI_REGISTRY_IMAGE}/${HOST_OS}-dirac
@@ -165,6 +181,7 @@ services:
165181
- dirac-server
166182
volumes:
167183
- certs_data:/ca/certs
184+
- crls_data:/ca/crl/
168185
ulimits:
169186
nofile: 8192
170187
command: ["sleep", "infinity"] # This is necessary because of the issue described in https://github.com/moby/moby/issues/42275. What is added here is a hack/workaround.
@@ -180,6 +197,7 @@ services:
180197
- dirac-server
181198
volumes:
182199
- certs_data:/ca/certs
200+
- crls_data:/ca/crl/
183201
- type: bind
184202
source: ${CVMFS_DIR}
185203
target: /cvmfs
@@ -195,7 +213,6 @@ services:
195213
start_period: 60s
196214
command: ["sleep", "infinity"] # This is necessary because of the issue described in https://github.com/moby/moby/issues/42275. What is added here is a hack/workaround.
197215

198-
199216
diracx-chmod:
200217
platform: linux/amd64
201218
image: ghcr.io/diracgrid/diracx/secret-generation:latest
@@ -210,7 +227,6 @@ services:
210227
bash -xc 'chmod -R o=u /keystore && chmod -R o=u /cs_store'
211228
pull_policy: always
212229

213-
214230
diracx-init-keystore:
215231
platform: linux/amd64
216232
image: ghcr.io/diracgrid/diracx/services:dev
@@ -308,7 +324,14 @@ services:
308324
/entrypoint.sh bash -xc 'uvicorn --factory diracx.routers:create_app --host=0.0.0.0'
309325
310326
healthcheck:
311-
test: ["CMD", "/entrypoint.sh", "python", "-c", "import requests; requests.get('http://localhost:8000/.well-known/openid-configuration').raise_for_status()"]
327+
test:
328+
[
329+
"CMD",
330+
"/entrypoint.sh",
331+
"python",
332+
"-c",
333+
"import requests; requests.get('http://localhost:8000/.well-known/openid-configuration').raise_for_status()",
334+
]
312335
interval: 5s
313336
timeout: 2s
314337
retries: 15

0 commit comments

Comments
 (0)