🚦 Mise en place de deux domaines sur toute la stack : locale, CI, staging

.env.template

@@ -1,16 +1,16 @@
 AIRFLOW_CONN_QFDMO_DJANGO_DB=postgresql+psycopg2://qfdmo:qfdmo@localhost:6543/qfdmo
-AIRFLOW_WEBSERVER_REFRESHACTEUR_URL=http://localhost:8080
-ALLOWED_HOSTS=localhost,127.0.0.1
+AIRFLOW_WEBSERVER_REFRESHACTEUR_URL=https://lvao.dev
+ALLOWED_HOSTS=lvao.dev,assistant.dev
 AWS_ACCESS_KEY_ID=
 AWS_S3_ENDPOINT_URL='https://s3.fr-par.scw.cloud'
 AWS_S3_REGION_NAME='fr-par'
 AWS_SECRET_ACCESS_KEY=
 AWS_STORAGE_BUCKET_NAME='qfdmo-interface'
-BASE_URL=http://localhost:8000
+LVAO_BASE_URL=https://lvao.ademe.local
 CMS_BASE_URL=https://longuevieauxobjets.ademe.fr
 CARTE_MAX_SOLUTION_DISPLAYED=10
 CONN_MAX_AGE=0
-CORS_ALLOWED_ORIGINS=http://localhost:8000,http://127.0.0.1:8000
+CORS_ALLOWED_ORIGINS=https://lvao.dev
 DATABASE_URL=postgis://qfdmo:qfdmo@localhost:6543/qfdmo
 DB_READONLY=postgis://qfdmo:qfdmo@localhost:6543/qfdmo
 DEBUG=True
@@ -26,8 +26,8 @@ STIMULUS_DEBUG=false
 POSTHOG_DEBUG=false
 ASSISTANT_MATOMO_ID=82
 ASSISTANT_POSTHOG_KEY=phc_fSfhoWDOUxZdKWty16Z3XfRiAoWd1qdJK0N0z9kQHJr # [DEV] project
-ASSISTANT_HOSTS=localhost:8000
-ASSISTANT_BASE_URL=http://localhost:8000
+ASSISTANT_HOSTS=assistant.ademe.local
+ASSISTANT_BASE_URL=https://assistant.ademe.local
 NOTION_TOKEN=
 NOTION_CONTACT_FORM_DATABASE_ID=17c6523d57d78140b87f000cd3ecef4b # Correspond à https://www.notion.so/accelerateur-transition-ecologique-ademe/17c6523d57d7808b8cc5f5ccae264f7c?v=17c6523d57d78140b87f000cd3ecef4b&pvs=4
 DATA_UPLOAD_MAX_NUMBER_FIELDS=10000

.github/workflows/ci.yml

@@ -2,6 +2,7 @@ name: "Intégration continue"
 
 on:
   pull_request:
+    types: [labeled, opened, synchronize]
   workflow_dispatch:
 
 defaults:

.github/workflows/run_tests.yml

@@ -71,6 +71,7 @@ jobs:
 
   e2e:
     runs-on: ubuntu-latest
+    if: contains(join(github.event.pull_request.labels.*.name, ','), 'frontend')
     strategy:
       matrix:
         shard: [1/5, 2/5, 3/5, 4/5, 5/5]

.gitignore

@@ -35,3 +35,4 @@ media
 
 _build
 .obsidian
+*.pem

.secrets.baseline

@@ -151,7 +151,7 @@
         "filename": "core/settings.py",
         "hashed_secret": "1ee34e26aeaf89c64ecc2c85efe6a961b75a50e9",
         "is_verified": false,
-        "line_number": 220
+        "line_number": 264
       }
     ],
     "docker-compose.yml": [
@@ -160,7 +160,7 @@
         "filename": "docker-compose.yml",
         "hashed_secret": "3cf2012487b086bba2adb3386d69c2ab67a268b6",
         "is_verified": false,
-        "line_number": 54
+        "line_number": 60
       }
     ],
     "iframe_without_js.html": [
@@ -207,5 +207,5 @@
       }
     ]
   },
-  "generated_at": "2025-01-29T18:47:34Z"
+  "generated_at": "2025-02-19T08:51:32Z"
 }

Makefile

@@ -9,6 +9,8 @@ PYTHON := .venv/bin/python
 DJANGO_ADMIN := $(PYTHON) manage.py
 PYTEST := $(PYTHON) -m pytest
 DB_URL := postgres://qfdmo:qfdmo@localhost:6543/qfdmo# pragma: allowlist secret
+ASSISTANT_URL := quefairedemesdechets.ademe.local
+LVAO_URL := lvao.ademe.local
 
 # Makefile config
 .PHONY: check
@@ -22,6 +24,9 @@ check:
 update-requirements:
 	$(PYTHON) -m pip install --no-deps -r requirements.txt -r dev-requirements.txt
 
+.PHONY: init-certs
+init-certs:
+	docker run -ti -v ./nginx-local-only/certs:/app/certs -w /app/certs --rm alpine/mkcert $(LVAO_URL) $(ASSISTANT_URL)
 
 .PHONY: init-venv
 init-venv:
@@ -34,6 +39,7 @@ init-dev:
 	pre-commit install
 	# python
 	make init-venv
+	make init-certs
 	$(PYTHON) -m pip install pip-tools
 	$(PYTHON) -m pip install --no-deps -r requirements.txt -r dev-requirements.txt
 	# javascript