From 44743289b19ed3f40cecf945f15141c963a3dd0e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josef=20Kol=C3=A1=C5=99?= Date: Sat, 18 Nov 2023 12:30:36 +0100 Subject: [PATCH] chore(dev): use local media in local production --- Makefile | 2 +- docker-compose.override.yml | 1 - docker-compose.yml | 3 +++ 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 09401adc..5bc85280 100644 --- a/Makefile +++ b/Makefile @@ -97,7 +97,7 @@ up: DC_CMD = up up: dc ## Runs all needed docker containers produp: ## Runs fiesta in (local)production mode. - $(DC) -f docker-compose.yml -f docker-compose.prod.yml --profile prod up + $(DC) -f docker-compose.yml -f docker-compose.prod.yml --profile prod up --build psql: DC_CMD = run --entrypoint bash db -c "PGPASSWORD=fiesta psql --host db --user fiesta --dbname fiesta" psql: dc ## Runs psql shell in database diff --git a/docker-compose.override.yml b/docker-compose.override.yml index 18a8d5d0..a573cfe7 100644 --- a/docker-compose.override.yml +++ b/docker-compose.override.yml @@ -7,7 +7,6 @@ services: - ./fiesta/:/usr/src/app/ - ./conf/certs:/usr/share/certs - web_static_files:/usr/src/static - - web_media_files:/usr/src/media - webpack_build:/usr/src/build build: args: diff --git a/docker-compose.yml b/docker-compose.yml index f0b7eaab..0e74c2ba 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -13,6 +13,9 @@ services: target: web-base depends_on: - db + volumes: + # for dev and also produp + - web_media_files:/usr/src/media environment: VIRTUAL_HOST: web.${ROOT_DOMAIN} VIRTUAL_PORT: 8000