##// END OF EJS Templates
rccontrol: fix init order, and remove obsolete logvolume
super-admin -
Show More
@@ -82,7 +82,7 b' services:'
82
82
83 volumes:
83 volumes:
84 - confvolume:/etc/rhodecode/conf
84 - confvolume:/etc/rhodecode/conf
85 - logvolume:/var/log/rhodecode
85
86 - rc_reposvolume:/var/opt/rhodecode_repo_store
86 - rc_reposvolume:/var/opt/rhodecode_repo_store
87 - rc_datavolume:/var/opt/rhodecode_data
87 - rc_datavolume:/var/opt/rhodecode_data
88
88
@@ -148,7 +148,7 b' services:'
148
148
149 volumes:
149 volumes:
150 - confvolume:/etc/rhodecode/conf
150 - confvolume:/etc/rhodecode/conf
151 - logvolume:/var/log/rhodecode
151
152 - rc_reposvolume:/var/opt/rhodecode_repo_store
152 - rc_reposvolume:/var/opt/rhodecode_repo_store
153 - rc_datavolume:/var/opt/rhodecode_data
153 - rc_datavolume:/var/opt/rhodecode_data
154
154
@@ -195,7 +195,7 b' services:'
195
195
196 volumes:
196 volumes:
197 - confvolume:/etc/rhodecode/conf
197 - confvolume:/etc/rhodecode/conf
198 - logvolume:/var/log/rhodecode
198
199 - rc_reposvolume:/var/opt/rhodecode_repo_store
199 - rc_reposvolume:/var/opt/rhodecode_repo_store
200 - rc_datavolume:/var/opt/rhodecode_data
200 - rc_datavolume:/var/opt/rhodecode_data
201
201
@@ -240,7 +240,7 b' services:'
240
240
241 volumes:
241 volumes:
242 - confvolume:/etc/rhodecode/conf
242 - confvolume:/etc/rhodecode/conf
243 - logvolume:/var/log/rhodecode
243
244 - rc_reposvolume:/var/opt/rhodecode_repo_store
244 - rc_reposvolume:/var/opt/rhodecode_repo_store
245 - rc_datavolume:/var/opt/rhodecode_data
245 - rc_datavolume:/var/opt/rhodecode_data
246
246
@@ -288,7 +288,7 b' services:'
288
288
289 volumes:
289 volumes:
290 - confvolume:/etc/rhodecode/conf
290 - confvolume:/etc/rhodecode/conf
291 - logvolume:/var/log/rhodecode
291
292 - rc_reposvolume:/var/opt/rhodecode_repo_store
292 - rc_reposvolume:/var/opt/rhodecode_repo_store
293 - rc_datavolume:/var/opt/rhodecode_data
293 - rc_datavolume:/var/opt/rhodecode_data
294
294
@@ -329,7 +329,7 b' services:'
329
329
330 volumes:
330 volumes:
331 - confvolume:/etc/rhodecode/conf
331 - confvolume:/etc/rhodecode/conf
332 - logvolume:/var/log/rhodecode
332
333 - rc_reposvolume:/var/opt/rhodecode_repo_store
333 - rc_reposvolume:/var/opt/rhodecode_repo_store
334 - rc_datavolume:/var/opt/rhodecode_data
334 - rc_datavolume:/var/opt/rhodecode_data
335
335
@@ -18,13 +18,6 b' x-logging: &custom-logging'
18 loki-max-backoff: "800ms"
18 loki-max-backoff: "800ms"
19
19
20 volumes:
20 volumes:
21 # shared logvolume
22 logvolume:
23 driver: local
24 driver_opts:
25 type: none
26 o: bind
27 device: $PWD/logs
28
21
29 # bind-mount with configs
22 # bind-mount with configs
30 confvolume:
23 confvolume:
@@ -54,7 +54,7 b' services:'
54
54
55 volumes:
55 volumes:
56 - confvolume:/etc/rhodecode/conf
56 - confvolume:/etc/rhodecode/conf
57 - logvolume:/var/log/rhodecode
57
58
58
59 logging:
59 logging:
60 *custom-logging
60 *custom-logging
@@ -100,7 +100,7 b' services:'
100 - ./config/nginx/nginx.conf:/etc/nginx/nginx.conf:ro
100 - ./config/nginx/nginx.conf:/etc/nginx/nginx.conf:ro
101 - ./config/nginx/http.conf:/etc/nginx/http.conf:ro
101 - ./config/nginx/http.conf:/etc/nginx/http.conf:ro
102 - ./config/nginx/proxy.conf:/etc/nginx/proxy.conf:ro
102 - ./config/nginx/proxy.conf:/etc/nginx/proxy.conf:ro
103 - logvolume:/var/log/rhodecode
103
104 - rc_datavolume:/var/opt/rhodecode_data
104 - rc_datavolume:/var/opt/rhodecode_data
105
105
106 logging:
106 logging:
@@ -172,7 +172,7 b' services:'
172
172
173 volumes:
173 volumes:
174 - ./config/redis/redis.conf:/etc/redis/redis.conf:ro
174 - ./config/redis/redis.conf:/etc/redis/redis.conf:ro
175 - logvolume:/var/log/rhodecode
175
176 - redis_data:/data
176 - redis_data:/data
177
177
178 profiles:
178 profiles:
@@ -219,7 +219,7 b' services:'
219 - $PWD/.custom/db_dump:/var/rc-data-dump
219 - $PWD/.custom/db_dump:/var/rc-data-dump
220 # save the pg_data volume
220 # save the pg_data volume
221 - pg_data:/var/lib/postgresql/data
221 - pg_data:/var/lib/postgresql/data
222 - logvolume:/var/log/rhodecode
222
223
223
224 profiles:
224 profiles:
225 ["postgres", "database"]
225 ["postgres", "database"]
@@ -249,7 +249,7 b' services:'
249 - ./config/database/mysql_customized.conf:/etc/mysql/conf.d/config-file.cnf:ro
249 - ./config/database/mysql_customized.conf:/etc/mysql/conf.d/config-file.cnf:ro
250 # save the mysql_data volume
250 # save the mysql_data volume
251 - $PWD/mysql_dir:/var/lib/mysql
251 - $PWD/mysql_dir:/var/lib/mysql
252 - logvolume:/var/log/rhodecode
252
253
253
254 profiles:
254 profiles:
255 ["mysql"]
255 ["mysql"]
@@ -4569,8 +4569,8 b' initialize() {'
4569 BOOTSTRAP_STAGES="\
4569 BOOTSTRAP_STAGES="\
4570 bootstrap_v1_docker_install:bootstrap_docker_install \
4570 bootstrap_v1_docker_install:bootstrap_docker_install \
4571 bootstrap_v1_docker_commons:bootstrap_docker_commons \
4571 bootstrap_v1_docker_commons:bootstrap_docker_commons \
4572 bootstrap_v1_config:bootstrap_config \
4573 bootstrap_v1_definitions:bootstrap_definitions \
4572 bootstrap_v1_definitions:bootstrap_definitions \
4573 bootstrap_v1_config:bootstrap_config \
4574 bootstrap_v1_overrides:bootstrap_overrides \
4574 bootstrap_v1_overrides:bootstrap_overrides \
4575 "
4575 "
4576
4576
General Comments 0
You need to be logged in to leave comments. Login now