dev: clean up dev docker-compose

- Move docker-compose overrides files to docker folder
- Add scripts/osrd-compose.sh to start docker-compose with host overrides

Author: ElysaSrc

.github/workflows/editoast.yml

@@ -83,7 +83,7 @@ jobs:
           ref: ${{ github.event.pull_request.head.sha }}
 
       - name: Init database
-        run: psql postgresql://postgres:password@localhost -f init_db.sql
+        run: psql postgresql://postgres:password@localhost -f ./docker/init_db.sql
 
       - name: Install lib posgresql & geos
         run: |

docker-compose-host.yml

@@ -1,7 +1,9 @@
 version: '3'
+
 volumes:
   psql_data:
   redis_data:
+
 services:
   postgres:
     image: postgis/postgis:15-3.4-alpine
@@ -13,7 +15,7 @@ services:
       POSTGRES_PASSWORD: "password"
     volumes:
       - "psql_data:/var/lib/postgresql/data"
-      - "./init_db.sql:/docker-entrypoint-initdb.d/init.sql"
+      - "./docker/init_db.sql:/docker-entrypoint-initdb.d/init.sql"
     healthcheck:
       test: ["CMD", "pg_isready", "-d", "postgres://osrd:password@postgres/osrd"]
       start_period: 4s
@@ -39,12 +41,12 @@ services:
       context: core
       dockerfile: Dockerfile
     restart: unless-stopped
-    ports: ["8080:80"]
-    command: "java -ea -jar /app/osrd_core.jar api -p 80"
+    ports: ["8080:8080"]
+    command: "java -ea -jar /app/osrd_core.jar api -p 8080"
     environment:
       MIDDLEWARE_BASE_URL: "http://osrd-editoast"
     healthcheck:
-      test: ["CMD", "curl", "-f", "http://localhost/health"]
+      test: ["CMD", "curl", "-f", "http://localhost:8080/health"]
       start_period: 4s
       interval: 5s
 
@@ -58,8 +60,8 @@ services:
         NGINX_CONFIG: "nginx-dev.conf"
         OSRD_GIT_DESCRIBE: ${OSRD_GIT_DESCRIBE}
     environment:
-    - OSRD_LOCAL_BACKEND=true
-    - OSRD_EDITOAST_URL=http://localhost:8090
+      OSRD_LOCAL_BACKEND: "true"
+      OSRD_EDITOAST_URL: http://localhost:8090
     restart: unless-stopped
     ports: ["3000:80"]
     healthcheck:
@@ -82,7 +84,7 @@ services:
       EDITOAST_PORT: 80
       PSQL_HOST: "postgres"
       REDIS_URL: "redis://redis"
-      OSRD_BACKEND_URL: "http://osrd-core"
+      OSRD_BACKEND_URL: "http://osrd-core:8080"
       DATABASE_URL: "postgres://osrd:password@postgres/osrd"
     command:
       - /bin/sh

docker-compose.yml

@@ -0,0 +1,37 @@
+version: '3'
+
+services:
+  postgres:
+    ports: []
+    network_mode: host
+    healthcheck:
+      test: ["CMD", "pg_isready", "-d", "postgres://osrd:password@localhost:5432/osrd"]
+
+  redis:
+    ports: []
+    network_mode: host
+
+  core:
+    ports: []
+    network_mode: host
+    environment:
+      MIDDLEWARE_BASE_URL: "http://localhost:8090"
+
+  editoast:
+    ports: []
+    network_mode: host
+    environment:
+      PSQL_HOST: "localhost"
+      EDITOAST_PORT: 8090
+      OSRD_BACKEND_URL: "http://localhost:8080"
+      REDIS_URL: "redis://localhost"
+      DATABASE_URL: "postgres://osrd:password@localhost:5432/osrd"
+    healthcheck:
+      test: ["CMD", "curl", "-f", "http://localhost:8090/health"]
+
+  wait-healthy:
+    depends_on:
+      editoast: {condition: service_healthy}
+    restart: "no"
+    image: alpine:latest
+    command: "true"

docker/docker-compose.host.yml

@@ -1,4 +1,5 @@
 version: '3'
+
 services:
   storybook:
     image: osrd/storybook

docker-compose-storybook.yml docker/docker-compose.storybook.yml

@@ -0,0 +1,13 @@
+#!/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" \
+    "$@"