From 32bd9633ca3f90b487aecccced34747351ab6f46 Mon Sep 17 00:00:00 2001 From: Daniel Mohns Date: Tue, 23 Jan 2024 15:20:37 +0100 Subject: [PATCH 1/2] Make the compose file more lean --- docker-compose.yml | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index e6912c95b..f9c95b5fb 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,7 +1,7 @@ -version: "3.1" +version: "3" services: - 'laravel': + laravel: container_name: laravel build: context: Docker/ @@ -18,7 +18,7 @@ services: - ./Website/config/php/php.ini:/usr/local/etc/php/php.ini - ./Website/htdocs:/var/www/html - 'ui': + ui: container_name: ui build: context: ./Website/ui/ @@ -29,7 +29,7 @@ services: - ./Website/ui:/usr/app/ - frontend_node_modules:/usr/app/node_modules/ - 'cron': + cron: container_name: cron_job build: context: Docker/ @@ -44,7 +44,7 @@ services: - ./Website/config/php/php.ini:/usr/local/etc/php/php.ini - ./Website/htdocs:/var/www/html - 'worker': + worker: container_name: worker restart: unless-stopped build: @@ -69,12 +69,13 @@ services: volumes: - ./Website/htdocs/mpmanager:/app - 'redis': + redis: + container_name: redis image: redis:5 volumes: - ./redis/:/data - 'maria': + maria: container_name: maria image: mariadb:10.3 env_file: From 3be7cf09a7d780770c8ef2dcb08022c664fcfcf9 Mon Sep 17 00:00:00 2001 From: Daniel Mohns Date: Tue, 23 Jan 2024 15:25:14 +0100 Subject: [PATCH 2/2] Use Docker Volumes for data storage --- docker-compose.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index f9c95b5fb..aa48f91c5 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -73,7 +73,7 @@ services: container_name: redis image: redis:5 volumes: - - ./redis/:/data + - redis_data:/data maria: container_name: maria @@ -81,7 +81,7 @@ services: env_file: - ./Docker/.env volumes: - - ./DB/mysql:/var/lib/mysql + - mariadb_data:/var/lib/mysql ports: - 3307:3306 @@ -112,3 +112,5 @@ services: volumes: frontend_node_modules: + mariadb_data: + redis_data: