From 2acde5423d4c4ce2d5461b13f70fb4161a748617 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Turbelin?= <paco@kokali.net>
Date: Sun, 19 Jan 2025 21:00:28 +0100
Subject: [PATCH] Remove extra containers

---
 compose.yaml | 41 +++++------------------------------------
 1 file changed, 5 insertions(+), 36 deletions(-)

diff --git a/compose.yaml b/compose.yaml
index 72837470e2..ec7cd1b05b 100644
--- a/compose.yaml
+++ b/compose.yaml
@@ -18,6 +18,7 @@ services:
     build: .
     ports:
       - 3000:3000
+      - 3035:3035
     volumes:
       - .:/usr/src/app
       - gems:/bundles
@@ -27,51 +28,19 @@ services:
     depends_on:
       - db
       - redis
-      - webpack
     environment:
+      DOCKER: true
+      CHROME_URL: http://browserless:4000
       OFN_DB_HOST: db
       OFN_REDIS_URL: redis://redis/
       OFN_REDIS_JOBS_URL: redis://redis
       OFN_REDIS_TEST_URL: redis://redis/3
-      WEBPACKER_DEV_SERVER_HOST: webpack
     command: >
-      bash -c "wait-for-it -t 30 db:5432 &&
-               rm -f tmp/pids/server.pid &&
+      bash -c "rm -f tmp/pids/server.pid &&
                (bundle check || bundle install) &&
                bundle exec rake db:create &&
                yarn install &&
-               bundle exec rails s -p 3000 -b '0.0.0.0'"
-  webpack:
-    build: .
-    command: ./bin/webpack-dev-server
-    volumes:
-      - .:/usr/src/app
-      - gems:/bundles
-    ports:
-      - '3035:3035'
-    environment:
-      NODE_ENV: development
-      RAILS_ENV: development
-      WEBPACKER_DEV_SERVER_HOST: 0.0.0.0
-  worker:
-    tty: true
-    stdin_open: true
-    build: .
-    volumes:
-      - .:/usr/src/app
-      - gems:/bundles
-      - ./config/database.yml:/usr/src/app/config/database.yml
-    depends_on:
-      - db
-      - redis
-    environment:
-      OFN_DB_HOST: db
-      OFN_REDIS_URL: redis://redis
-      OFN_REDIS_JOBS_URL: redis://redis
-    command: >
-      bash -c "wait-for-it -t 30 db:5432 &&
-               (bundle check || bundle install) &&
-               bundle exec sidekiq -q mailers -q default"
+               tail -f log/development.log"
 volumes:
   gems:
   postgres: