🔧(project) change env.d system by using local files

We had lot of problems with the previous env.d system.
Users were often confused by the need to change
the env.d files manually, leading to issues
when using the project locally.
This commit introduces a new system that uses
.env.local files, which are automatically created
and can be modified by users without affecting
the original env.d files. This should simplify
the development process and reduce confusion by
removing the need to manually edit env.d files.
This commit is contained in:
Anthony LC
2025-07-18 13:23:56 +02:00
parent f2e54308d2
commit 040eddbe6b
11 changed files with 21 additions and 26 deletions

View File

@@ -80,7 +80,7 @@ jobs:
fail-on-cache-miss: true fail-on-cache-miss: true
- name: Set e2e env variables - name: Set e2e env variables
run: cat env.d/development/common.e2e.dist >> env.d/development/common.dist run: cat env.d/development/common.e2e >> env.d/development/common.local
- name: Install Playwright Browsers - name: Install Playwright Browsers
run: cd src/frontend/apps/e2e && yarn install --frozen-lockfile && yarn install-playwright chromium run: cd src/frontend/apps/e2e && yarn install --frozen-lockfile && yarn install-playwright chromium
@@ -119,7 +119,7 @@ jobs:
fail-on-cache-miss: true fail-on-cache-miss: true
- name: Set e2e env variables - name: Set e2e env variables
run: cat env.d/development/common.e2e.dist >> env.d/development/common.dist run: cat env.d/development/common.e2e >> env.d/development/common.local
- name: Install Playwright Browsers - name: Install Playwright Browsers
run: cd src/frontend/apps/e2e && yarn install --frozen-lockfile && yarn install-playwright firefox webkit chromium run: cd src/frontend/apps/e2e && yarn install --frozen-lockfile && yarn install-playwright firefox webkit chromium

3
.gitignore vendored
View File

@@ -40,8 +40,7 @@ venv/
ENV/ ENV/
env.bak/ env.bak/
venv.bak/ venv.bak/
env.d/development/* env.d/development/*.local
!env.d/development/*.dist
env.d/terraform env.d/terraform
# npm # npm

View File

@@ -17,6 +17,7 @@ and this project adheres to
### Changed ### Changed
- ⚡️(docker) Optimize Dockerfile to use apk with --no-cache #743 - ⚡️(docker) Optimize Dockerfile to use apk with --no-cache #743
- 🔧(project) change env.d system by using local files #1200
### Fixed ### Fixed

View File

@@ -67,18 +67,18 @@ data/static:
# -- Project # -- Project
create-env-files: ## Copy the dist env files to env files create-env-local-files: ## create env.local files in env.d/development
create-env-files: \ create-env-local-files:
env.d/development/common \ @touch env.d/development/crowdin.local
env.d/development/crowdin \ @touch env.d/development/common.local
env.d/development/postgresql \ @touch env.d/development/postgresql.local
env.d/development/kc_postgresql @touch env.d/development/kc_postgresql.local
.PHONY: create-env-files .PHONY: create-env-local-files
pre-bootstrap: \ pre-bootstrap: \
data/media \ data/media \
data/static \ data/static \
create-env-files create-env-local-files
.PHONY: pre-bootstrap .PHONY: pre-bootstrap
post-bootstrap: \ post-bootstrap: \
@@ -258,20 +258,6 @@ resetdb: ## flush database and create a superuser "admin"
@${MAKE} superuser @${MAKE} superuser
.PHONY: resetdb .PHONY: resetdb
env.d/development/common:
cp -n env.d/development/common.dist env.d/development/common
env.d/development/postgresql:
cp -n env.d/development/postgresql.dist env.d/development/postgresql
env.d/development/kc_postgresql:
cp -n env.d/development/kc_postgresql.dist env.d/development/kc_postgresql
# -- Internationalization
env.d/development/crowdin:
cp -n env.d/development/crowdin.dist env.d/development/crowdin
crowdin-download: ## Download translated message from crowdin crowdin-download: ## Download translated message from crowdin
@$(COMPOSE_RUN_CROWDIN) download -c crowdin/config.yml @$(COMPOSE_RUN_CROWDIN) download -c crowdin/config.yml
.PHONY: crowdin-download .PHONY: crowdin-download

View File

@@ -24,5 +24,6 @@ services:
restart: unless-stopped restart: unless-stopped
env_file: env_file:
- env.d/development/common - env.d/development/common
- env.d/development/common.local
ports: ports:
- "4444:4444" - "4444:4444"

View File

@@ -10,6 +10,7 @@ services:
retries: 300 retries: 300
env_file: env_file:
- env.d/development/postgresql - env.d/development/postgresql
- env.d/development/postgresql.local
ports: ports:
- "15432:5432" - "15432:5432"
@@ -66,7 +67,9 @@ services:
- DJANGO_CONFIGURATION=Development - DJANGO_CONFIGURATION=Development
env_file: env_file:
- env.d/development/common - env.d/development/common
- env.d/development/common.local
- env.d/development/postgresql - env.d/development/postgresql
- env.d/development/postgresql.local
ports: ports:
- "8071:8000" - "8071:8000"
volumes: volumes:
@@ -91,7 +94,9 @@ services:
- DJANGO_CONFIGURATION=Development - DJANGO_CONFIGURATION=Development
env_file: env_file:
- env.d/development/common - env.d/development/common
- env.d/development/common.local
- env.d/development/postgresql - env.d/development/postgresql
- env.d/development/postgresql.local
volumes: volumes:
- ./src/backend:/app - ./src/backend:/app
- ./data/static:/data/static - ./data/static:/data/static
@@ -135,6 +140,7 @@ services:
- ".:/app" - ".:/app"
env_file: env_file:
- env.d/development/crowdin - env.d/development/crowdin
- env.d/development/crowdin.local
user: "${DOCKER_USER:-1000}" user: "${DOCKER_USER:-1000}"
working_dir: /app working_dir: /app
@@ -156,6 +162,7 @@ services:
restart: unless-stopped restart: unless-stopped
env_file: env_file:
- env.d/development/common - env.d/development/common
- env.d/development/common.local
ports: ports:
- "4444:4444" - "4444:4444"
volumes: volumes:
@@ -174,6 +181,7 @@ services:
- "5433:5432" - "5433:5432"
env_file: env_file:
- env.d/development/kc_postgresql - env.d/development/kc_postgresql
- env.d/development/kc_postgresql.local
keycloak: keycloak:
image: quay.io/keycloak/keycloak:20.0.1 image: quay.io/keycloak/keycloak:20.0.1