🚦 Mise en place de nginx en local (#1321)

* Add nginx and dual domain setup

* fix merge conflict

* fix precommit issue

* Make nginx work

* Test things

* ???

* ???

* More dynamic playwright approach

* wip

* Add nginx

* a single url...

* Fix a test

* deprecate legacy urls

* wip

* Run all test suite

* wip

* fix unit tests

* Remove useless test

* hum hum

* oopsy

* oopsy

* oopsy

* Disable test for now

* Presque fini

* Rename url in header html

* rename context processsor

---------

Co-authored-by: Nicolas Oudard <nicolas@oudard.org>

Author: fabienheureux

.env.template

@@ -1,16 +1,12 @@
 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.ademe.local
 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
-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
 DATABASE_URL=postgis://qfdmo:qfdmo@localhost:6543/qfdmo
 DB_READONLY=postgis://qfdmo:qfdmo@localhost:6543/qfdmo
 DEBUG=True
@@ -26,8 +22,11 @@ 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
 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
+DATA_UPLOAD_MAX_NUMBER_FIELDS=10000
+
+BASE_URL=https://quefairedemesdechets.ademe.local
+CMS_BASE_URL=https://longuevieauxobjets.ademe.fr
+ASSISTANT_HOSTS=quefairedemesdechets.ademe.local
+ALLOWED_HOSTS=lvao.ademe.local,quefairedemesdechets.ademe.local

.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

@@ -77,6 +77,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]
@@ -96,6 +97,14 @@ jobs:
           - 6543:5432
     steps:
       - uses: actions/checkout@v4
+
+      - name: Prepare environment
+        run: |
+          cp .env.template .env
+          echo BASE_URL=http://localhost:8000 >> .env
+          echo ALLOWED_HOSTS=localhost >> .env
+          echo ASSISTANT_HOSTS=localhost >> .env
+
       - uses: actions/setup-node@v4
         with:
           node-version-file: ".tool-versions"
@@ -125,9 +134,6 @@ jobs:
       - name: Install the project dependencies
         run: poetry sync --with dev --no-root
 
-      - name: Set env variables
-        run: cp .env.template .env
-
       - name: Migrate database
         run: |
           poetry run python manage.py createcachetable
@@ -146,10 +152,3 @@ jobs:
 
       - name: Run Playwright tests
         run: npx playwright test --reporter=list --update-snapshots --shard=${{ matrix.shard }}
-
-      - uses: actions/upload-artifact@v4
-        if: always()
-        with:
-          name: playwright-report
-          path: playwright-report/
-          retention-days: 30

.gitignore

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

.secrets.baseline

@@ -138,7 +138,7 @@
         "filename": "core/settings.py",
         "hashed_secret": "1ee34e26aeaf89c64ecc2c85efe6a961b75a50e9",
         "is_verified": false,
-        "line_number": 218
+        "line_number": 275
       }
     ],
     "dbt/package-lock.yml": [
@@ -156,7 +156,7 @@
         "filename": "docker-compose.yml",
         "hashed_secret": "3cf2012487b086bba2adb3386d69c2ab67a268b6",
         "is_verified": false,
-        "line_number": 55
+        "line_number": 60
       }
     ],
     "iframe_without_js.html": [
@@ -187,5 +187,5 @@
       }
     ]
   },
-  "generated_at": "2025-04-16T15:04:57Z"
+  "generated_at": "2025-04-22T10:11:19Z"
 }

Makefile

@@ -9,6 +9,8 @@ PYTHON := poetry run python
 DJANGO_ADMIN := $(PYTHON) manage.py
 PYTEST := poetry run 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
@@ -17,6 +19,10 @@ check:
 	@npm --version
 	@node --version
 
+.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-dev
 init-dev:
@@ -26,6 +32,7 @@ init-dev:
 	# python
 	curl -sSL https://install.python-poetry.org | python3 -
 	poetry install --with dev,airflow
+	make init-certs
 	# javascript
 	npm install
 	npx playwright install --with-deps
@@ -50,7 +57,6 @@ run-airflow:
 
 .PHONY: run-django
 run-django:
-	docker compose --profile lvao up -d
 	rm -rf .parcel-cache
 	honcho start -f Procfile.dev
 
@@ -100,7 +106,7 @@ unit-test:
 
 .PHONY: e2e-test
 e2e-test:
-	npx playwright test
+	npx playwright test --ui
 	$(PYTEST) ./integration_tests
 
 .PHONY: a11y

core/context_processors.py

@@ -24,18 +24,24 @@ def content(request):
     return vars(constants)
 
 
-def assistant(request) -> dict:
-    if request.META.get("HTTP_HOST") not in settings.ASSISTANT["HOSTS"]:
-        return {}
-
-    return {
+def global_context(request) -> dict:
+    base = {
         "assistant": {
             "is_home": request.path == reverse("home"),
             "is_iframe": request.COOKIES.get("iframe") == "1"
             or "iframe" in request.GET,
             "POSTHOG_KEY": settings.ASSISTANT["POSTHOG_KEY"],
             "MATOMO_ID": settings.ASSISTANT["MATOMO_ID"],
+            "BASE_URL": settings.ASSISTANT["BASE_URL"],
         },
+        "lvao": {"BASE_URL": settings.ASSISTANT["BASE_URL"]},
+    }
+
+    if request.META.get("HTTP_HOST") not in settings.ASSISTANT["HOSTS"]:
+        return base
+
+    return {
+        **base,
         "footer_pages": CMSPage.objects.all(),
         "search_form": SearchForm(),
         "search_view_template_name": SEARCH_VIEW_TEMPLATE_NAME,