Skip to content

Commit d3753e7

Browse files
committed
remove build sections and migrate r to ro
1 parent 33773fb commit d3753e7

File tree

2 files changed

+14
-32
lines changed

2 files changed

+14
-32
lines changed

compose.yaml

Lines changed: 7 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -35,16 +35,13 @@ services:
3535
- qiita-data:/qiita_data
3636
- server-plugin-configs:/qiita_plugins
3737
- ./logs:/logs
38-
- ./Images/qiita/config_qiita_oidc.cfg:/qiita_configurations/qiita_server.cfg:r
39-
- ./Images/qiita/config_portal.cfg:/qiita_configurations/config_portal.cfg:r
38+
- ./Images/qiita/config_qiita_oidc.cfg:/qiita_configurations/qiita_server.cfg:ro
39+
- ./Images/qiita/config_portal.cfg:/qiita_configurations/config_portal.cfg:ro
4040
networks:
4141
- qiita-net
4242

4343
qiita:
4444
image: local-qiita:latest
45-
build: # image wird hier direkt gebaut
46-
context: ./Images/qiita
47-
dockerfile: Dockerfile
4845
restart: "no"
4946
depends_on:
5047
- qiita-worker
@@ -60,8 +57,8 @@ services:
6057
- qiita-data:/qiita_data
6158
- ./src/qiita:/qiita:U
6259
- ./logs:/logs
63-
- ./Images/qiita/config_qiita_oidc.cfg:/qiita_configurations/qiita_server.cfg:r
64-
- ./Images/qiita/config_portal.cfg:/qiita_configurations/config_portal.cfg:r
60+
- ./Images/qiita/config_qiita_oidc.cfg:/qiita_configurations/qiita_server.cfg:ro
61+
- ./Images/qiita/config_portal.cfg:/qiita_configurations/config_portal.cfg:ro
6562
- server-plugin-configs:/qiita_plugins
6663
- ./references/qiita_server_certificates:/qiita_certificates
6764
# - ./Images/qiita/start_qiita.sh:/start_qiita.sh
@@ -73,9 +70,6 @@ services:
7370

7471
qiita-worker:
7572
image: local-qiita:latest
76-
build: # image wird hier direkt gebaut
77-
context: ./Images/qiita
78-
dockerfile: Dockerfile
7973
restart: "no"
8074
depends_on:
8175
redis:
@@ -93,8 +87,8 @@ services:
9387
volumes:
9488
- qiita-data:/qiita_data
9589
- ./logs:/logs
96-
- ./Images/qiita/config_qiita_oidc.cfg:/qiita_configurations/qiita_server.cfg:r
97-
- ./Images/qiita/config_portal.cfg:/qiita_configurations/config_portal.cfg:r
90+
- ./Images/qiita/config_qiita_oidc.cfg:/qiita_configurations/qiita_server.cfg:ro
91+
- ./Images/qiita/config_portal.cfg:/qiita_configurations/config_portal.cfg:ro
9892
- server-plugin-configs:/qiita_plugins
9993
- ./references/qiita_server_certificates:/qiita_certificates
10094
- ./src/qiita:/qiita:U
@@ -154,9 +148,6 @@ services:
154148

155149
nginx:
156150
image: local-nginx_qiita:latest
157-
build:
158-
context: ./Images/nginx
159-
dockerfile: Dockerfile
160151
ports:
161152
- "8383:8383"
162153
restart: "no"
@@ -281,7 +272,7 @@ services:
281272
networks:
282273
- qiita-net
283274
volumes:
284-
- ./Images/qiita/config_qiita_oidc.cfg:/qiita_configurations/qiita_server.cfg:r
275+
- ./Images/qiita/config_qiita_oidc.cfg:/qiita_configurations/qiita_server.cfg:ro
285276
- server-plugin-configs:/qiita_plugins
286277
- qiita-data:/qiita_data
287278
depends_on:

compose_github.yaml

Lines changed: 7 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -39,17 +39,14 @@ services:
3939
volumes:
4040
- qiita-data:/qiita_data
4141
- server-plugin-configs:/qiita_plugins
42-
- ./Images/qiita/config_qiita_oidc.cfg:/qiita_configurations/qiita_server.cfg:r
43-
- ./Images/qiita/config_portal.cfg:/qiita_configurations/config_portal.cfg:r
42+
- ./Images/qiita/config_qiita_oidc.cfg:/qiita_configurations/qiita_server.cfg:ro
43+
- ./Images/qiita/config_portal.cfg:/qiita_configurations/config_portal.cfg:ro
4444
- qiita-logs:/logs
4545
networks:
4646
- qiita-net
4747

4848
qiita:
4949
image: ghcr.io/jlab/qiita-keycloak/qiita:testcandidate
50-
build: # image wird hier direkt gebaut
51-
context: ./Images/qiita
52-
dockerfile: Dockerfile
5350
restart: "no"
5451
depends_on:
5552
- qiita-worker
@@ -64,8 +61,8 @@ services:
6461
volumes:
6562
- qiita-data:/qiita_data
6663
- qiita-logs:/logs
67-
- ./Images/qiita/config_qiita_oidc.cfg:/qiita_configurations/qiita_server.cfg:r
68-
- ./Images/qiita/config_portal.cfg:/qiita_configurations/config_portal.cfg:r
64+
- ./Images/qiita/config_qiita_oidc.cfg:/qiita_configurations/qiita_server.cfg:ro
65+
- ./Images/qiita/config_portal.cfg:/qiita_configurations/config_portal.cfg:ro
6966
- server-plugin-configs:/qiita_plugins
7067
- ./references/qiita_server_certificates:/qiita_certificates
7168
- test_tmp_dir:/tmp
@@ -76,9 +73,6 @@ services:
7673

7774
qiita-worker:
7875
image: ghcr.io/jlab/qiita-keycloak/qiita:testcandidate
79-
build: # image wird hier direkt gebaut
80-
context: ./Images/qiita
81-
dockerfile: Dockerfile
8276
restart: "no"
8377
depends_on:
8478
redis:
@@ -96,8 +90,8 @@ services:
9690
volumes:
9791
- qiita-data:/qiita_data
9892
- qiita-logs:/logs
99-
- ./Images/qiita/config_qiita_oidc.cfg:/qiita_configurations/qiita_server.cfg:r
100-
- ./Images/qiita/config_portal.cfg:/qiita_configurations/config_portal.cfg:r
93+
- ./Images/qiita/config_qiita_oidc.cfg:/qiita_configurations/qiita_server.cfg:ro
94+
- ./Images/qiita/config_portal.cfg:/qiita_configurations/config_portal.cfg:ro
10195
- server-plugin-configs:/qiita_plugins
10296
- ./references/qiita_server_certificates:/qiita_certificates
10397
- test_tmp_dir:/tmp
@@ -125,9 +119,6 @@ services:
125119

126120
nginx:
127121
image: ghcr.io/jlab/qiita-keycloak/nginx:testcandidate
128-
build:
129-
context: ./Images/nginx
130-
dockerfile: Dockerfile
131122
ports:
132123
- "8383:8383"
133124
restart: "no"
@@ -263,7 +254,7 @@ services:
263254
networks:
264255
- qiita-net
265256
volumes:
266-
- ./Images/qiita/config_qiita_oidc.cfg:/qiita_configurations/qiita_server.cfg:r
257+
- ./Images/qiita/config_qiita_oidc.cfg:/qiita_configurations/qiita_server.cfg:ro
267258
- server-plugin-configs:/qiita_plugins
268259
- qiita-data:/qiita_data
269260
depends_on:

0 commit comments

Comments
 (0)