From 96338f21f161f86bb775cd3e154f506f4cb94b57 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89lyse=20Viard?= <elysasrc@proton.me>
Date: Thu, 16 Jan 2025 16:18:22 +0100
Subject: [PATCH] ci, dev: remove frontend nginx version, dev stack with
 bundled front by default
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Use the gateway-front in the e2e tests
- Simplify the integration tests step removing gateway and front images
- Use the gateway front image for the front, removing the container front
  of the default stack
- Create a Docker compose for the front devel stack

Signed-off-by: Élyse Viard <elysasrc@proton.me>
---
 .github/workflows/build.yml                   |  75 ++++-------
 .gitignore                                    |   3 +
 docker-compose.yml                            |  33 +----
 docker/docker-bake-simple.hcl                 |  57 ---------
 docker/docker-bake.hcl                        |  76 +++++-------
 docker/docker-compose.front.yml               |  29 +++++
 docker/docker-compose.host-front.yml          |  29 +++++
 docker/docker-compose.host.yml                |   2 +-
 docker/gateway-front.dockerfile               |  11 --
 ...dev.simple.toml => gateway.dev.front.toml} |   0
 docker/gateway.dev.host-front.toml            |  38 ++++++
 docker/gateway.dev.host.toml                  |   9 +-
 front/docker/Dockerfile                       |   4 +
 front/docker/Dockerfile.nginx                 |  38 ------
 front/docker/nginx-entrypoint.sh              |   7 --
 front/docker/nginx.conf                       |  15 ---
 gateway/Dockerfile                            |  35 +++++-
 .../entrypoint.sh                             |   0
 gateway/gateway.bundled.toml                  |  44 +++++++
 gateway/gateway.prod.sample.toml              |  28 -----
 osrd-compose                                  | 116 ++++++++++++++++++
 scripts/host-compose.sh                       |  13 --
 22 files changed, 359 insertions(+), 303 deletions(-)
 delete mode 100644 docker/docker-bake-simple.hcl
 create mode 100644 docker/docker-compose.front.yml
 create mode 100644 docker/docker-compose.host-front.yml
 delete mode 100644 docker/gateway-front.dockerfile
 rename docker/{gateway.dev.simple.toml => gateway.dev.front.toml} (100%)
 create mode 100644 docker/gateway.dev.host-front.toml
 create mode 100644 front/docker/Dockerfile
 delete mode 100644 front/docker/Dockerfile.nginx
 delete mode 100755 front/docker/nginx-entrypoint.sh
 delete mode 100644 front/docker/nginx.conf
 rename docker/gateway-entrypoint.sh => gateway/entrypoint.sh (100%)
 create mode 100644 gateway/gateway.bundled.toml
 delete mode 100644 gateway/gateway.prod.sample.toml
 create mode 100755 osrd-compose
 delete mode 100755 scripts/host-compose.sh

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 281d78c393c..2f2a4711233 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -27,7 +27,7 @@ jobs:
           - [core-build, core]
           - [editoast, editoast-test]
           - [gateway-test, gateway-standalone, gateway-front]
-          - [front-build, front-tests, front-devel, front-nginx]
+          - [front-tests]
           - [osrdyne, osrdyne-test]
     steps:
       - name: Checkout
@@ -105,12 +105,6 @@ jobs:
           echo "All retries failed, exiting."
           exit 1
 
-      - name: Upload front-build artifact
-        uses: actions/upload-artifact@v4
-        if: steps.bake-metadata.outputs.output_method == 'artifact' && contains(matrix.targets, 'front-build')
-        with:
-          name: front-build
-          path: osrd-front-build.tar
       - name: Upload core-build artifact
         uses: actions/upload-artifact@v4
         if: steps.bake-metadata.outputs.output_method == 'artifact' && contains(matrix.targets, 'core-build')
@@ -191,6 +185,8 @@ jobs:
           docker build -t test_data - <Dockerfile.empty
           docker build -t static_assets - <Dockerfile.empty
           docker build -t front_tests:latest - <Dockerfile.empty
+          docker build -t front_build:latest - <Dockerfile.empty
+          docker build -t front_src:latest - <Dockerfile.empty
 
       - name: Find and check all Dockerfiles using docker build --check
         run: |
@@ -468,13 +464,13 @@ jobs:
         if: needs.build.outputs.output_method == 'artifact'
         uses: actions/download-artifact@v4
         with:
-          name: front-build
+          name: front-tests
           path: .
 
       - name: Load built images
         if: needs.build.outputs.output_method == 'artifact'
         run: |
-          docker load --input ./osrd-front-build.tar
+          docker load --input ./osrd-front-tests.tar
           docker image ls -a
 
       - name: Generate rtk bindings
@@ -483,7 +479,7 @@ jobs:
           -v $PWD/editoast:/editoast
           -v $PWD/gateway:/gateway
           -v $PWD/front/src/common/api:/app/src/common/api
-          ${{ fromJSON(needs.build.outputs.stable_tags).front-build }}
+          ${{ fromJSON(needs.build.outputs.stable_tags).front-tests }}
           npm run generate-types
 
       - name: Check for unexpected changes
@@ -679,18 +675,18 @@ jobs:
         with:
           name: editoast
           path: .
-      - name: Download built front-build image
+      - name: Download built front-tests image
         if: needs.build.outputs.output_method == 'artifact'
         uses: actions/download-artifact@v4
         with:
-          name: front-build
+          name: front-tests
           path: .
 
       - name: Load built images
         if: needs.build.outputs.output_method == 'artifact'
         run: |
           docker load --input ./osrd-editoast.tar
-          docker load --input ./osrd-front-build.tar
+          docker load --input ./osrd-front-tests.tar
 
       - name: Generate OpenAPI
         run: |
@@ -705,7 +701,7 @@ jobs:
       - name: Check for i18n API errors
         run: |
           docker run --name=front-i18n-api-error --net=host -v $PWD/output/openapi.yaml:/editoast/openapi.yaml \
-              ${{ fromJSON(needs.build.outputs.stable_tags).front-build }} \
+              ${{ fromJSON(needs.build.outputs.stable_tags).front-tests }} \
               npm run i18n-api-errors
           exit $(docker wait front-i18n-api-error)
 
@@ -849,18 +845,18 @@ jobs:
         if: needs.build.outputs.output_method == 'artifact'
         uses: actions/download-artifact@v4
         with:
-          name: front-build
+          name: front-tests
           path: .
 
       - name: Load built images
         if: needs.build.outputs.output_method == 'artifact'
         run: |
-          docker load --input ./osrd-front-build.tar
+          docker load --input ./osrd-front-tests.tar
 
       - name: Check code formatting
         run: |
           docker run --name=front-format --net=host \
-            ${{ fromJSON(needs.build.outputs.stable_tags).front-build }} \
+            ${{ fromJSON(needs.build.outputs.stable_tags).front-tests }} \
             npx prettier . --check
 
           exit $(docker wait front-format)
@@ -868,14 +864,14 @@ jobs:
       - name: Check for i18n missing keys
         run: |
           docker run --name=front-i18n-checker --net=host \
-            ${{ fromJSON(needs.build.outputs.stable_tags).front-build }} \
+            ${{ fromJSON(needs.build.outputs.stable_tags).front-tests }} \
             npm run i18n-checker
           exit $(docker wait front-i18n-checker)
 
       - name: Execute tests within container
         run: |
           docker run --name=front-test --net=host -v $PWD/output:/app/tests/unit \
-            ${{ fromJSON(needs.build.outputs.stable_tags).front-build }} \
+            ${{ fromJSON(needs.build.outputs.stable_tags).front-tests }} \
             npm run test-coverage
 
           exit $(docker wait front-test)
@@ -900,12 +896,6 @@ jobs:
       # https://www.jameskerr.blog/posts/sharing-steps-in-github-action-workflows/
       - name: Checkout
         uses: actions/checkout@v4
-      - name: Download built front-tests image
-        if: needs.build.outputs.output_method == 'artifact'
-        uses: actions/download-artifact@v4
-        with:
-          name: front-tests
-          path: .
       - name: Download built editoast image
         if: needs.build.outputs.output_method == 'artifact'
         uses: actions/download-artifact@v4
@@ -918,18 +908,6 @@ jobs:
         with:
           name: core
           path: .
-      - name: Download built gateway-standalone image
-        if: needs.build.outputs.output_method == 'artifact'
-        uses: actions/download-artifact@v4
-        with:
-          name: gateway-standalone
-          path: .
-      - name: Download built front-nginx image
-        if: needs.build.outputs.output_method == 'artifact'
-        uses: actions/download-artifact@v4
-        with:
-          name: front-nginx
-          path: .
       - name: Download built osrdyne image
         if: needs.build.outputs.output_method == 'artifact'
         uses: actions/download-artifact@v4
@@ -939,11 +917,8 @@ jobs:
       - name: Load built images
         if: needs.build.outputs.output_method == 'artifact'
         run: |
-          docker load --input ./osrd-front-tests.tar
           docker load --input ./osrd-editoast.tar
           docker load --input ./osrd-core.tar
-          docker load --input ./osrd-gateway-standalone.tar
-          docker load --input ./osrd-front-nginx.tar
           docker load --input ./osrd-osrdyne.tar
       - name: Install poetry
         run: pipx install 'poetry<2.0'
@@ -961,14 +936,13 @@ jobs:
         id: start_integration_worker
         run: |
           set -e
-          export OSRD_FRONT_MODE=nginx
           export TAG='${{ needs.build.outputs.stable_version }}'
 
           # Inside /docker/osrdyne.yml, replace core_image "osrd-core:dev" with "osrd-core:$TAG"
           # to match the version of the core image we just built inside osrdyne
           sed -i "s/osrd-core:dev/osrd-core:$TAG/" docker/osrdyne.yml
 
-          services='editoast osrdyne front core gateway'
+          services='editoast osrdyne core'
           composes='-f docker-compose.yml'
           docker compose $composes pull --policy missing $services
           docker compose $composes up --no-build -d $services jaeger
@@ -1029,17 +1003,11 @@ jobs:
         with:
           name: core
           path: .
-      - name: Download built gateway-standalone image
-        if: needs.build.outputs.output_method == 'artifact'
-        uses: actions/download-artifact@v4
-        with:
-          name: gateway-standalone
-          path: .
-      - name: Download built front-nginx image
+      - name: Download built gateway-front image
         if: needs.build.outputs.output_method == 'artifact'
         uses: actions/download-artifact@v4
         with:
-          name: front-nginx
+          name: gateway-front
           path: .
       - name: Download built osrdyne image
         if: needs.build.outputs.output_method == 'artifact'
@@ -1053,8 +1021,7 @@ jobs:
           docker load --input ./osrd-front-tests.tar
           docker load --input ./osrd-editoast.tar
           docker load --input ./osrd-core.tar
-          docker load --input ./osrd-gateway-standalone.tar
-          docker load --input ./osrd-front-nginx.tar
+          docker load --input ./osrd-gateway-front.tar
           docker load --input ./osrd-osrdyne.tar
 
       - name: Detect Playwright version
@@ -1079,14 +1046,14 @@ jobs:
         id: start_playwright_worker
         run: |
           set -e
-          export OSRD_FRONT_MODE=nginx
           export TAG='${{ needs.build.outputs.stable_version }}'
+          export GATEWAY_FLAVOR='front'
 
           # Inside /docker/osrdyne.yml, replace core_image "osrd-core:dev" with "osrd-core:$TAG"
           # to match the version of the core image we just built inside osrdyne
           sed -i "s/osrd-core:dev/osrd-core:$TAG/" docker/osrdyne.yml
 
-          services='editoast osrdyne front core gateway'
+          services='editoast osrdyne core gateway'
           composes='-f docker-compose.yml'
           docker compose $composes pull --policy missing $services
           docker compose $composes up --no-build -d $services jaeger
diff --git a/.gitignore b/.gitignore
index ce357786f0e..a91f58f8609 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,6 @@ __pycache__
 # Direnv
 .envrc
 .direnv
+
+# Helper script
+.osrd-compose-state
diff --git a/docker-compose.yml b/docker-compose.yml
index d06be9b3007..e7c5d2cba5e 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -5,6 +5,7 @@ volumes:
   valkey_data:
   rabbitmq_data:
 
+
 services:
   postgres:
     image: ${OSRD_POSTGIS_IMAGE:-postgis/postgis:16-3.4-alpine}
@@ -84,30 +85,6 @@ services:
     restart: "no"
     command: "true"
 
-  front:
-    image: ghcr.io/openrailassociation/osrd-edge/osrd-front:${TAG-dev}-${OSRD_FRONT_MODE-devel}
-    container_name: osrd-front
-    build:
-      context: front
-      additional_contexts:
-        test_data: tests/data
-      dockerfile: docker/Dockerfile.${OSRD_FRONT_MODE-devel}
-      args:
-        OSRD_GIT_DESCRIBE: development
-    environment:
-      FRONT_PORT: 3000 # only useful with the prod config
-      OSRD_EDITOAST_URL: /api
-    volumes:
-      - "./front:/app"
-      - "./tests/data:/tests/data"
-    restart: unless-stopped
-    ports: [ "3000:3000" ]
-    healthcheck:
-      test: [ "CMD", "curl", "-f", "http://localhost:3000" ]
-      start_period: 4s
-      interval: 5s
-      retries: 6
-
   editoast:
     image: ghcr.io/openrailassociation/osrd-edge/osrd-editoast:${TAG-dev}
     container_name: osrd-editoast
@@ -146,16 +123,16 @@ services:
       retries: 6
 
   gateway:
-    image: ghcr.io/openrailassociation/osrd-edge/osrd-gateway:${TAG-dev}-standalone
+    image: ghcr.io/openrailassociation/osrd-edge/osrd-gateway:${TAG-dev}-${GATEWAY_FLAVOR-front}
     container_name: osrd-gateway
     build:
       context: gateway
       dockerfile: Dockerfile
       args:
-        OSRD_GIT_DESCRIBE: ${OSRD_GIT_DESCRIBE}
+        OSRD_GIT_DESCRIBE: development
         CARGO_PROFILE: dev
-    volumes:
-      - "./docker/gateway.dev.simple.toml:/gateway.toml"
+      additional_contexts:
+        front_src: front
     restart: unless-stopped
     ports: [ "4000:4000" ]
 
diff --git a/docker/docker-bake-simple.hcl b/docker/docker-bake-simple.hcl
deleted file mode 100644
index 654f6a7a0b4..00000000000
--- a/docker/docker-bake-simple.hcl
+++ /dev/null
@@ -1,57 +0,0 @@
-variable "OSRD_GIT_DESCRIBE" {}
-
-variable "TAG_PATTERNS" {
-}
-
-function "tags" {
-  params = [image_name]
-  result = [for pat in split(",", TAG_PATTERNS): format(pat, image_name)]
-}
-
-target "base-core" {
-  tags = tags("core")
-}
-
-target "base-core-build" {
-  tags = tags("core-build")
-}
-
-target "base-editoast" {
-  tags = tags("editoast")
-}
-
-target "base-front-dev" {
-  tags = tags("front-dev")
-}
-
-target "base-front-nginx" {
-  tags = tags("front-nginx")
-}
-
-target "base-front-build" {
-  tags = tags("front-build")
-}
-
-target "base-front-tests" {
-  tags = tags("front-tests")
-}
-
-target "base-gateway-standalone" {
-  tags = tags("gateway-standalone")
-}
-
-target "base-gateway-test" {
-  tags = tags("gateway-test")
-}
-
-target "base-gateway-front" {
-  tags = tags("gateway-front")
-}
-
-target "base-osrdyne" {
-  tags = tags("osrdyne")
-}
-
-target "base-osrdyne-test" {
-  tags = tags("osrdyne")
-}
diff --git a/docker/docker-bake.hcl b/docker/docker-bake.hcl
index 983f7e9214d..6dca700577f 100644
--- a/docker/docker-bake.hcl
+++ b/docker/docker-bake.hcl
@@ -6,9 +6,6 @@ group "default" {
     "core-build",
     "editoast",
     "editoast-test",
-    "front-devel",
-    "front-nginx",
-    "front-build",
     "front-tests",
     "gateway-standalone",
     "gateway-test",
@@ -90,43 +87,6 @@ target "editoast" {
   }
 }
 
-#########
-# Front #
-#########
-
-target "base-front-devel" {}
-target "front-devel" {
-  inherits = ["base", "base-front-devel"]
-  context = "front"
-  dockerfile = "docker/Dockerfile.devel"
-}
-
-target "base-front-nginx" {}
-target "front-nginx" {
-  inherits = ["base", "base-front-nginx"]
-  context = "front"
-  dockerfile = "docker/Dockerfile.nginx"
-}
-
-target "base-front-build" {}
-target "front-build" {
-  inherits = ["base", "base-front-build"]
-  context = "front"
-  dockerfile = "docker/Dockerfile.nginx"
-  target = "build"
-}
-
-target "base-front-tests" {}
-target "front-tests" {
-  inherits = ["base", "base-front-tests"]
-  context = "front"
-  dockerfile = "docker/Dockerfile.nginx"
-  target = "tests"
-  contexts = {
-    test_data = "./tests/data"
-  }
-}
-
 ###########
 # Gateway #
 ###########
@@ -147,15 +107,41 @@ target "gateway-test" {
   target = "testing_env"
 }
 
+target "base-gateway-front-build" {}
+target "gateway-front-build" {
+  inherits = ["base", "base-gateway-front-build"]
+  context = "gateway"
+  dockerfile = "Dockerfile"
+  target = "front_build"
+  contexts = {
+    front_src = "./front"
+  }
+}
+
 target "base-gateway-front" {}
 target "gateway-front" {
   inherits = ["base", "base-gateway-front"]
-  dockerfile = "gateway-front.dockerfile"
-  context = "docker"
+  dockerfile = "Dockerfile"
+  target = "front_running_env"
+  context = "gateway"
+  contexts = {
+    front_src = "./front"
+  }
+}
+
+#########
+# Front #
+#########
+
+target "base-front-tests" {}
+target "front-tests" {
+  inherits = ["base", "base-front-tests"]
+  context = "front"
+  dockerfile = "docker/Dockerfile"
+  target = "tests"
   contexts = {
-    gateway_src = "./gateway"
-    gateway_build = "target:gateway-standalone"
-    front_build = "target:front-build"
+    front_build = "target:gateway-front-build"
+    test_data = "./tests/data"
   }
 }
 
diff --git a/docker/docker-compose.front.yml b/docker/docker-compose.front.yml
new file mode 100644
index 00000000000..b4d80124745
--- /dev/null
+++ b/docker/docker-compose.front.yml
@@ -0,0 +1,29 @@
+services:
+  gateway:
+    image: ghcr.io/openrailassociation/osrd-edge/osrd-gateway:${TAG-dev}-${GATEWAY_FLAVOR-standalone}
+    volumes:
+      - "./docker/gateway.dev.front.toml:/srv/gateway.toml"
+
+  front:
+    image: ghcr.io/openrailassociation/osrd-edge/osrd-front:${TAG-dev}-dev
+    container_name: osrd-front
+    build:
+      context: front
+      additional_contexts:
+        test_data: tests/data
+      dockerfile: docker/Dockerfile.${OSRD_FRONT_MODE-devel}
+      args:
+        OSRD_GIT_DESCRIBE: ${OSRD_GIT_DESCRIBE}
+    environment:
+      FRONT_PORT: 3000 # only useful with the prod config
+      OSRD_EDITOAST_URL: /api
+    volumes:
+      - "./front:/app"
+      - "./tests/data:/tests/data"
+    restart: unless-stopped
+    ports: [ "3000:3000" ]
+    healthcheck:
+      test: [ "CMD", "curl", "-f", "http://localhost:3000" ]
+      start_period: 4s
+      interval: 5s
+      retries: 6
diff --git a/docker/docker-compose.host-front.yml b/docker/docker-compose.host-front.yml
new file mode 100644
index 00000000000..336e853b249
--- /dev/null
+++ b/docker/docker-compose.host-front.yml
@@ -0,0 +1,29 @@
+services:
+  gateway:
+    image: ghcr.io/openrailassociation/osrd-edge/osrd-gateway:${TAG-dev}-${GATEWAY_FLAVOR-standalone}
+    volumes:
+      - "./docker/gateway.dev.host-front.toml:/srv/gateway.toml"
+
+  front:
+    image: ghcr.io/openrailassociation/osrd-edge/osrd-front:${TAG-dev}-dev
+    container_name: osrd-front
+    build:
+      context: front
+      additional_contexts:
+        test_data: tests/data
+      dockerfile: docker/Dockerfile.${OSRD_FRONT_MODE-devel}
+      args:
+        OSRD_GIT_DESCRIBE: ${OSRD_GIT_DESCRIBE}
+    environment:
+      FRONT_PORT: 3000 # only useful with the prod config
+      OSRD_EDITOAST_URL: /api
+    volumes:
+      - "./front:/app"
+      - "./tests/data:/tests/data"
+    restart: unless-stopped
+    ports: [ "3000:3000" ]
+    healthcheck:
+      test: [ "CMD", "curl", "-f", "http://localhost:3000" ]
+      start_period: 4s
+      interval: 5s
+      retries: 6
diff --git a/docker/docker-compose.host.yml b/docker/docker-compose.host.yml
index a1a242fa9aa..ea796cc82be 100644
--- a/docker/docker-compose.host.yml
+++ b/docker/docker-compose.host.yml
@@ -26,7 +26,7 @@ services:
     ports: !reset []
     network_mode: host
     volumes:
-      - "./docker/gateway.dev.host.toml:/gateway.toml"
+      - "./docker/gateway.dev.host.toml:/srv/gateway.toml"
 
   osrd-images:
     ports: !reset []
diff --git a/docker/gateway-front.dockerfile b/docker/gateway-front.dockerfile
deleted file mode 100644
index d019c2bc3f2..00000000000
--- a/docker/gateway-front.dockerfile
+++ /dev/null
@@ -1,11 +0,0 @@
-FROM gateway_build
-
-# Copy the front
-WORKDIR /srv
-COPY --from=front_build /app/build /srv/front/
-
-# Copy an example config file
-COPY --from=gateway_src ./gateway.prod.sample.toml /gateway.sample.toml
-COPY --chmod=755 ./gateway-entrypoint.sh /srv/entrypoint.sh
-ENTRYPOINT ["/srv/entrypoint.sh"]
-CMD ["/usr/local/bin/osrd_gateway"]
diff --git a/docker/gateway.dev.simple.toml b/docker/gateway.dev.front.toml
similarity index 100%
rename from docker/gateway.dev.simple.toml
rename to docker/gateway.dev.front.toml
diff --git a/docker/gateway.dev.host-front.toml b/docker/gateway.dev.host-front.toml
new file mode 100644
index 00000000000..829aad69948
--- /dev/null
+++ b/docker/gateway.dev.host-front.toml
@@ -0,0 +1,38 @@
+# This config file is copied into the host networking dev container when in front mode
+
+# generate a production key with this command:
+# python3 -c "import secrets, base64; print(base64.standard_b64encode(secrets.token_bytes(64)).decode())"
+secret_key = "NOT+A+SECRET++NOT+A+SECRET++NOT+A+SECRET++NOT+A+SECRET++NOT+A+SECRET++NOT+A+SECRET++NOT+A+SECRET"
+
+listen_addr = "0.0.0.0"
+
+[telemetry.tracing]
+enable = true
+endpoint = "http://localhost:4317"
+
+[[targets]]
+tracing_name = "editoast"
+prefix = "/api"
+upstream = "http://localhost:8090"
+require_auth = true
+
+[[targets]]
+tracing_name = "front"
+upstream = "http://localhost:3000"
+require_auth = false
+
+[[targets]]
+tracing_name = "images"
+prefix = "/images"
+upstream = "http://localhost:8080"
+require_auth = false
+
+[auth]
+default_provider = "mock"
+secure_cookies = false
+
+[[auth.providers]]
+type = "Mocked"
+provider_id = "mock"
+username = "Example User"
+require_login = false
diff --git a/docker/gateway.dev.host.toml b/docker/gateway.dev.host.toml
index ca9f7333496..1f705357b15 100644
--- a/docker/gateway.dev.host.toml
+++ b/docker/gateway.dev.host.toml
@@ -6,6 +6,10 @@ secret_key = "NOT+A+SECRET++NOT+A+SECRET++NOT+A+SECRET++NOT+A+SECRET++NOT+A+SECR
 
 listen_addr = "0.0.0.0"
 
+[static_files]
+root_folder = "/srv/front"
+redirect_404_to_index = true
+
 [telemetry.tracing]
 enable = true
 endpoint = "http://localhost:4317"
@@ -16,11 +20,6 @@ prefix = "/api"
 upstream = "http://localhost:8090"
 require_auth = true
 
-[[targets]]
-tracing_name = "front"
-upstream = "http://localhost:3000"
-require_auth = false
-
 [[targets]]
 tracing_name = "images"
 prefix = "/images"
diff --git a/front/docker/Dockerfile b/front/docker/Dockerfile
new file mode 100644
index 00000000000..3250667cd65
--- /dev/null
+++ b/front/docker/Dockerfile
@@ -0,0 +1,4 @@
+FROM front_build AS tests
+
+# Allow to import tests data files
+COPY --from=test_data . /tests/data
diff --git a/front/docker/Dockerfile.nginx b/front/docker/Dockerfile.nginx
deleted file mode 100644
index 23b307ceb4f..00000000000
--- a/front/docker/Dockerfile.nginx
+++ /dev/null
@@ -1,38 +0,0 @@
-### BUILD STAGE
-
-FROM node:20-bookworm AS build
-
-WORKDIR /app
-
-
-# Build dependencies
-COPY package.json package-lock.json /app/
-RUN npm install --frozen-lockfile
-
-# Fill build time values
-ARG OSRD_GIT_DESCRIBE
-ENV VITE_OSRD_GIT_DESCRIBE=${OSRD_GIT_DESCRIBE}
-
-# Generate the licenses file and build
-COPY . /app
-RUN npm run generate-licenses && npm run build
-
-### TESTS STAGE
-
-FROM build AS tests
-
-# Allow to import tests data files
-COPY --from=test_data . /tests/data
-
-### SERVE STAGE
-
-FROM nginx:alpine
-
-RUN rm /etc/nginx/conf.d/default.conf
-COPY docker/nginx.conf /etc/nginx/conf.d
-COPY docker/nginx-entrypoint.sh /entrypoint.sh
-
-COPY --from=build /app/build /srv
-
-ENTRYPOINT ["/entrypoint.sh"]
-CMD ["sh", "-c", "exec nginx -g 'daemon off;'"]
diff --git a/front/docker/nginx-entrypoint.sh b/front/docker/nginx-entrypoint.sh
deleted file mode 100755
index 17bdc001ca9..00000000000
--- a/front/docker/nginx-entrypoint.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-: "${FRONT_PORT:=80}"
-
-sed -i "s|%FRONT_PORT%|${FRONT_PORT}|g" /etc/nginx/conf.d/nginx.conf
-
-exec "$@"
diff --git a/front/docker/nginx.conf b/front/docker/nginx.conf
deleted file mode 100644
index 9b8a7ce1a5e..00000000000
--- a/front/docker/nginx.conf
+++ /dev/null
@@ -1,15 +0,0 @@
-server {
-  listen %FRONT_PORT%;
-
-  location / {
-    root   /srv;
-    index  index.html index.htm;
-    try_files $uri $uri/ /index.html;
-  }
-
-  error_page   500 502 503 504  /50x.html;
-
-  location = /50x.html {
-    root   /srv;
-  }
-}
diff --git a/gateway/Dockerfile b/gateway/Dockerfile
index 8b0420f1841..37c0bc39f1a 100644
--- a/gateway/Dockerfile
+++ b/gateway/Dockerfile
@@ -48,10 +48,43 @@ COPY . .
 # Running env : build #
 #######################
 FROM alpine:3.20 AS running_env
-RUN apk add --no-cache curl ca-certificates bind-tools
+RUN apk add --no-cache curl ca-certificates bind-tools jq
 COPY --from=run_builder /usr/local/cargo/bin/osrd_gateway /usr/local/bin/osrd_gateway
 
 ARG OSRD_GIT_DESCRIBE
 ENV OSRD_GIT_DESCRIBE=${OSRD_GIT_DESCRIBE}
 
 CMD ["/usr/local/bin/osrd_gateway"]
+
+#####################
+# Build env : front #
+#####################
+FROM node:20-bookworm AS front_build
+WORKDIR /app
+
+# Build dependencies
+COPY --from=front_src package.json package-lock.json /app/
+RUN npm install --frozen-lockfile
+
+# Fill build time values
+ARG OSRD_GIT_DESCRIBE
+ENV VITE_OSRD_GIT_DESCRIBE=${OSRD_GIT_DESCRIBE}
+
+# Generate the licenses file and build
+COPY --from=front_src . /app
+RUN npm run generate-licenses && npm run build
+
+#######################
+# Running env : front #
+#######################
+FROM running_env AS front_running_env
+
+# Copy the front
+WORKDIR /srv
+COPY --from=front_build /app/build /srv/front/
+
+# Copy an example config file
+COPY ./gateway.bundled.toml /srv/gateway.toml
+COPY --chmod=755 ./entrypoint.sh /srv/entrypoint.sh
+ENTRYPOINT ["/srv/entrypoint.sh"]
+CMD ["/usr/local/bin/osrd_gateway"]
diff --git a/docker/gateway-entrypoint.sh b/gateway/entrypoint.sh
similarity index 100%
rename from docker/gateway-entrypoint.sh
rename to gateway/entrypoint.sh
diff --git a/gateway/gateway.bundled.toml b/gateway/gateway.bundled.toml
new file mode 100644
index 00000000000..d7fcd619285
--- /dev/null
+++ b/gateway/gateway.bundled.toml
@@ -0,0 +1,44 @@
+# This is an example production file. It's meant to be mounted inside the container at /gateway.toml
+
+secret_key = "NOT+A+SECRET++NOT+A+SECRET++NOT+A+SECRET++NOT+A+SECRET++NOT+A+SECRET++NOT+A+SECRET++NOT+A+SECRET"
+listen_addr = "0.0.0.0"
+port = 4000
+trusted_proxies = ["10.0.0.0/8", "172.16.0.0/12", "192.168.0.0/16"]
+
+[static_files]
+root_folder = "/srv/front"
+redirect_404_to_index = true
+
+[[targets]]
+prefix = "/api"
+upstream = "http://osrd-editoast:80"
+require_auth = true
+
+[[targets]]
+prefix = "/images"
+upstream = "http://osrd-images:8080"
+require_auth = false
+
+[auth]
+default_provider = "mock"
+secure_cookies = false
+
+[[auth.providers]]
+type = "Mocked"
+provider_id = "mock"
+username = "Example User"
+require_login = false
+
+# Example of OIDC auth
+# [auth]
+# default_provider = "oidc_provider"
+# secure_cookies = true
+#
+# [[auth.providers]]
+# type = "Oidc"
+# provider_id = "oidc_provider"
+# issuer_url = "https://%PROVIDER_URL%"
+# post_login_url = "https://%POST_LOGIN_URL%"
+# callback_url = "https://%APP_ROOT_URL%/auth/provider/example_provider/callback"
+# client_id = "%CLIENT_ID%"
+# client_secret = "%CLIENT_SECRET%"
diff --git a/gateway/gateway.prod.sample.toml b/gateway/gateway.prod.sample.toml
deleted file mode 100644
index 0effdb0957f..00000000000
--- a/gateway/gateway.prod.sample.toml
+++ /dev/null
@@ -1,28 +0,0 @@
-# This is an example production file. It's meant to be mounted inside the container at /gateway.toml
-
-listen_addr = "0.0.0.0"
-port = 80
-trusted_proxies = ["10.0.0.0/8", "172.16.0.0/12", "192.168.0.0/16"]
-
-[static_files]
-root_folder = "/srv/front"
-redirect_404_to_index = true
-
-[[targets]]
-prefix = "/api"
-upstream = "%EDITOAST_INTERNAL_URL%"
-require_auth = true
-
-[[targets]]
-prefix = "/images"
-upstream = "%OSRD_IMAGE_INTERNAL_URL%"
-require_auth = false
-
-[[auth.providers]]
-type = "Oidc"
-provider_id = "example_provider"
-issuer_url = "https://%PROVIDER_URL%"
-post_login_url = "https://%POST_LOGIN_URL%"
-callback_url = "https://%APP_ROOT_URL%/auth/provider/example_provider/callback"
-client_id = "%CLIENT_ID%"
-client_secret = "%CLIENT_SECRET%"
diff --git a/osrd-compose b/osrd-compose
new file mode 100755
index 00000000000..04505000621
--- /dev/null
+++ b/osrd-compose
@@ -0,0 +1,116 @@
+#!/usr/bin/env bash
+
+BASE_PATH="$(realpath "$(dirname "$0")")"
+STATE_FILE="${BASE_PATH}/.osrd-compose-state"
+BASE_COMPOSE="${BASE_PATH}/docker-compose.yml"
+OVERRIDE_DIR="${BASE_PATH}/docker"
+
+# Help
+show_help() {
+    cat << EOF
+
+Usage: $0 [FLAGS] [DOCKER_COMPOSE_COMMANDS]
+
+This script simplifies docker compose operations by managing override files.
+
+Flags (optional, can be combined):
+  front    Add front-end development container (docker/docker-compose.front.yml)
+  sw       Enable single worker mode (docker/docker-compose.single-worker.yml)
+  host     Use host networking mode (docker/docker-compose.host.yml)
+  default  Reset to base configuration only and clear saved state
+
+Examples:
+  $0 front sw up     # Start with front-end and single worker
+  $0 ps              # Use previous configuration
+  $0 default up      # Reset and start base configuration
+
+State System:
+The script maintains a state system to remember your last configuration.
+When you run the script with flags (front, sw, host), these choices are saved
+in a hidden file (.osrd-compose-state). Next time you run the script without
+flags, it will automatically use this saved configuration. This lets you run
+quick commands like 'ps' or 'logs' without re-specifying your setup each time.
+If you want to start fresh, use the 'default' flag to clear the saved state.
+
+State Management:
+- Previous flags are saved to .osrd-compose-state
+- Without flags, last known state is loaded
+- Without flags and no state file, only base compose is used
+- 'default' flag clears saved state
+EOF
+}
+
+# Display help if requested or no args given
+if [ "$1" = "--help" ] || [ "$1" = "help" ] || [ $# -eq 0 ]; then
+    show_help
+    exit 0
+fi
+
+# Initialize arrays for compose files and flags
+compose_files=("$BASE_COMPOSE")
+flags=()
+
+# Parse command line arguments for flags first
+while [[ $# -gt 0 ]]; do
+    case $1 in
+        default)
+            DEFAULT_FLAG=true
+            shift
+            ;;
+        front|sw|host)
+            flags+=("$1")
+            shift
+            ;;
+        *)
+            break
+            ;;
+    esac
+done
+
+# If the default flag was provided while other flags are present, raise an error
+if [ -n "$DEFAULT_FLAG" ] && [ ${#flags[@]} -gt 0 ]; then
+    echo "Error: 'default' flag cannot be combined with other flags"
+    exit 1
+fi
+
+# If the default flag was provided, clear the state file
+if [ -n "$DEFAULT_FLAG" ]; then
+    rm -f "$STATE_FILE"
+fi
+
+# If flags were provided, save them
+if [ ${#flags[@]} -gt 0 ]; then
+    printf "%s\n" "${flags[@]}" > "$STATE_FILE"
+# If no flags but state exists, load it
+elif [ -f "$STATE_FILE" ]; then
+    mapfile -t flags < "$STATE_FILE"
+fi
+
+if [[ " ${flags[@]} " =~ "host" ]]; then
+    compose_files+=("$OVERRIDE_DIR/docker-compose.host.yml")
+fi
+
+if [[ " ${flags[@]} " =~ "front" ]]; then
+    if [[ " ${flags[@]} " =~ "host" ]]; then
+        compose_files+=("$OVERRIDE_DIR/docker-compose.host-front.yml")
+    else
+        compose_files+=("$OVERRIDE_DIR/docker-compose.front.yml")
+    fi 
+fi
+
+if [[ " ${flags[@]} " =~ "sw" ]]; then
+    compose_files+=("$OVERRIDE_DIR/docker-compose.single-worker.yml")
+fi
+
+# Build docker-compose command
+cmd="docker compose"
+for file in "${compose_files[@]}"; do
+    cmd+=" -f $file"
+done
+
+# Add remaining arguments
+cmd+=" $*"
+
+# Execute the command
+echo "$cmd"
+exec $cmd
diff --git a/scripts/host-compose.sh b/scripts/host-compose.sh
deleted file mode 100755
index 41cc5789f9e..00000000000
--- a/scripts/host-compose.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/sh
-
-# This script leverages the host override docker-compose file to run the OSRD stack.
-# By design, this script is not meant to be run on Windows since it relies exclusively on network_mode: host.
-
-set -e
-
-# We override the default docker-compose file with the "host" version in the docker folder
-docker compose \
-    -p "osrd" \
-    -f "docker-compose.yml" \
-    -f "docker/docker-compose.host.yml" \
-    "$@"