From 555d14b7ae0638d42182d9d8c0bef278ee938067 Mon Sep 17 00:00:00 2001 From: Zankaria Date: Sun, 23 Jun 2024 14:43:13 +0200 Subject: [PATCH 1/2] docker: make the compose local instance folder file parametrizable --- docker-compose.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index da45b113..c691b303 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -9,7 +9,7 @@ services: depends_on: - db volumes: - - ./local-instances/1/www:/var/www/html + - ./local-instances/${LOCAL_INSTANCE_NAME:-0}/www:/var/www/html - ./docker/nginx/vichan.conf:/etc/nginx/conf.d/default.conf - ./docker/nginx/nginx.conf:/etc/nginx/nginx.conf - ./docker/nginx/proxy.conf:/etc/nginx/conf.d/proxy.conf @@ -21,7 +21,7 @@ services: context: . dockerfile: ./docker/php/Dockerfile volumes: - - ./local-instances/1/www:/var/www + - ./local-instances/${LOCAL_INSTANCE_NAME:-0}/www:/var/www - ./docker/php/www.conf:/usr/local/etc/php-fpm.d/www.conf - ./docker/php/jit.ini:/usr/local/etc/php/conf.d/jit.ini @@ -37,4 +37,4 @@ services: MYSQL_DATABASE: vichan MYSQL_ROOT_PASSWORD: password volumes: - - ./local-instances/1/mysql:/var/lib/mysql + - ./local-instances/${LOCAL_INSTANCE_NAME:-0}/mysql:/var/lib/mysql From ef1939500cf2da891840eea8f9a78d8631eb5bbc Mon Sep 17 00:00:00 2001 From: Zankaria Date: Sun, 23 Jun 2024 14:44:49 +0200 Subject: [PATCH 2/2] docker: use modern compose file naming scheme --- docker-compose.yml => compose.yml | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename docker-compose.yml => compose.yml (100%) diff --git a/docker-compose.yml b/compose.yml similarity index 100% rename from docker-compose.yml rename to compose.yml