diff --git a/docker-compose-apps.yaml b/docker-compose-apps.yaml index 594229d..5f3b24e 100644 --- a/docker-compose-apps.yaml +++ b/docker-compose-apps.yaml @@ -82,7 +82,7 @@ services: volumes: - confvolume:/etc/rhodecode/conf - - logvolume:/var/log/rhodecode + - rc_reposvolume:/var/opt/rhodecode_repo_store - rc_datavolume:/var/opt/rhodecode_data @@ -148,7 +148,7 @@ services: volumes: - confvolume:/etc/rhodecode/conf - - logvolume:/var/log/rhodecode + - rc_reposvolume:/var/opt/rhodecode_repo_store - rc_datavolume:/var/opt/rhodecode_data @@ -195,7 +195,7 @@ services: volumes: - confvolume:/etc/rhodecode/conf - - logvolume:/var/log/rhodecode + - rc_reposvolume:/var/opt/rhodecode_repo_store - rc_datavolume:/var/opt/rhodecode_data @@ -240,7 +240,7 @@ services: volumes: - confvolume:/etc/rhodecode/conf - - logvolume:/var/log/rhodecode + - rc_reposvolume:/var/opt/rhodecode_repo_store - rc_datavolume:/var/opt/rhodecode_data @@ -288,7 +288,7 @@ services: volumes: - confvolume:/etc/rhodecode/conf - - logvolume:/var/log/rhodecode + - rc_reposvolume:/var/opt/rhodecode_repo_store - rc_datavolume:/var/opt/rhodecode_data @@ -329,7 +329,7 @@ services: volumes: - confvolume:/etc/rhodecode/conf - - logvolume:/var/log/rhodecode + - rc_reposvolume:/var/opt/rhodecode_repo_store - rc_datavolume:/var/opt/rhodecode_data diff --git a/docker-compose-base.yaml b/docker-compose-base.yaml index 1df38e5..d56951f 100644 --- a/docker-compose-base.yaml +++ b/docker-compose-base.yaml @@ -18,13 +18,6 @@ x-logging: &custom-logging loki-max-backoff: "800ms" volumes: - # shared logvolume - logvolume: - driver: local - driver_opts: - type: none - o: bind - device: $PWD/logs # bind-mount with configs confvolume: diff --git a/docker-compose-services.yaml b/docker-compose-services.yaml index 6504421..dbef898 100644 --- a/docker-compose-services.yaml +++ b/docker-compose-services.yaml @@ -54,7 +54,7 @@ services: volumes: - confvolume:/etc/rhodecode/conf - - logvolume:/var/log/rhodecode + logging: *custom-logging @@ -100,7 +100,7 @@ services: - ./config/nginx/nginx.conf:/etc/nginx/nginx.conf:ro - ./config/nginx/http.conf:/etc/nginx/http.conf:ro - ./config/nginx/proxy.conf:/etc/nginx/proxy.conf:ro - - logvolume:/var/log/rhodecode + - rc_datavolume:/var/opt/rhodecode_data logging: @@ -172,7 +172,7 @@ services: volumes: - ./config/redis/redis.conf:/etc/redis/redis.conf:ro - - logvolume:/var/log/rhodecode + - redis_data:/data profiles: @@ -219,7 +219,7 @@ services: - $PWD/.custom/db_dump:/var/rc-data-dump # save the pg_data volume - pg_data:/var/lib/postgresql/data - - logvolume:/var/log/rhodecode + profiles: ["postgres", "database"] @@ -249,7 +249,7 @@ services: - ./config/database/mysql_customized.conf:/etc/mysql/conf.d/config-file.cnf:ro # save the mysql_data volume - $PWD/mysql_dir:/var/lib/mysql - - logvolume:/var/log/rhodecode + profiles: ["mysql"] diff --git a/scripts/rccontrol/rccontrol b/scripts/rccontrol/rccontrol index 3923d55..7f8de21 100755 --- a/scripts/rccontrol/rccontrol +++ b/scripts/rccontrol/rccontrol @@ -4569,8 +4569,8 @@ initialize() { BOOTSTRAP_STAGES="\ bootstrap_v1_docker_install:bootstrap_docker_install \ bootstrap_v1_docker_commons:bootstrap_docker_commons \ - bootstrap_v1_config:bootstrap_config \ bootstrap_v1_definitions:bootstrap_definitions \ + bootstrap_v1_config:bootstrap_config \ bootstrap_v1_overrides:bootstrap_overrides \ "