From 008e22532952813051e4692cabb2858c8146b7ec Mon Sep 17 00:00:00 2001 From: einhornimmond Date: Mon, 28 Apr 2025 20:17:26 +0200 Subject: [PATCH] update docker compose for changed database docker --- docker-compose.override.yml | 6 ++---- docker-compose.reset.yml | 4 ++-- docker-compose.test.yml | 4 ++-- docker-compose.yml | 4 ++-- 4 files changed, 8 insertions(+), 10 deletions(-) diff --git a/docker-compose.override.yml b/docker-compose.override.yml index e8c2d4d90..aa818ab0b 100644 --- a/docker-compose.override.yml +++ b/docker-compose.override.yml @@ -144,16 +144,15 @@ services: # Due to problems with the volume caching the built files # we changed this to test build. This keeps the service running. # name the image so that it cannot be found in a DockerHub repository, otherwise it will not be built locally from the 'dockerfile' but pulled from there - image: gradido/database:local-test_up + image: gradido/database:local-up build: - target: test_up + target: up environment: - NODE_ENV="development" volumes: # This makes sure the docker container has its own node modules. # Therefore it is possible to have a different node version on the host machine - database_node_modules:/app/node_modules - - database_build:/app/build # bind the local folder to the docker to allow live reload - ./database:/app @@ -239,6 +238,5 @@ volumes: federation_config_node_modules: federation_config_build: database_node_modules: - database_build: dlt-database_node_modules: dlt-database_build: \ No newline at end of file diff --git a/docker-compose.reset.yml b/docker-compose.reset.yml index 13708bdef..0d5a442de 100644 --- a/docker-compose.reset.yml +++ b/docker-compose.reset.yml @@ -12,10 +12,10 @@ services: ######################################################## database: # name the image so that it cannot be found in a DockerHub repository, otherwise it will not be built locally from the 'dockerfile' but pulled from there - image: gradido/database:local-production_reset + image: gradido/database:local-reset build: context: ./database - target: production_reset + target: reset depends_on: - mariadb networks: diff --git a/docker-compose.test.yml b/docker-compose.test.yml index de631ed15..1824772ce 100644 --- a/docker-compose.test.yml +++ b/docker-compose.test.yml @@ -68,10 +68,10 @@ services: # DATABASE ############################################# ######################################################## database: - image: gradido/database:test_up + image: gradido/database:up build: context: ./database - target: test_up + target: up environment: - NODE_ENV=test # restart: always # this is very dangerous, but worth a test for the delayed mariadb startup at first run diff --git a/docker-compose.yml b/docker-compose.yml index 88fc3bbcf..0c6e7ad1e 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -218,10 +218,10 @@ services: ######################################################## database: # name the image so that it cannot be found in a DockerHub repository, otherwise it will not be built locally from the 'dockerfile' but pulled from there - image: gradido/database:local-production_up + image: gradido/database:local-up build: context: ./database - target: production_up + target: up depends_on: - mariadb networks: