remove entry point dependencies

ThinkThinkAI · Sep 12, 2024 · 5ec26e6 · 5ec26e6
1 parent c94916f
commit 5ec26e6
Show file tree

Hide file tree

Showing 2 changed files with 101 additions and 92 deletions.
diff --git a/db/schema.rb b/db/schema.rb
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -1,8 +1,15 @@
+version: '3.8'
+
 services:
   web:
     build: .
-    command: bash -c "rm -f tmp/pids/server.pid && bundle exec rails server -b 0.0.0.0 -p 3000"
-    entrypoint: ["./entrypoint.sh"]
+    command: bash -c "
+        export REDIS_URL=redis://redis:6379/1 &&
+        export SECRET_KEY_BASE=$(bin/rails secret) &&
+        rm -f tmp/pids/server.pid &&
+        bundle exec rake assets:precompile &&
+        bundle exec rails db:migrate &&
+        bundle exec rails server -b 0.0.0.0 -p 3000"
     volumes:
       - .:/app
     ports:
@@ -15,12 +22,17 @@ services:
 
   worker:
     build: .
-    command: bundle exec sidekiq
-    entrypoint: ["./sidekiq-entrypoint.sh"]
+    command: bash -c "
+        export REDIS_URL=redis://redis:6379/1 &&
+        export SECRET_KEY_BASE=$(bin/rails secret) &&
+        rm -f tmp/pids/server.pid &&
+        bundle exec rails db:migrate &&
+        bundle exec sidekiq"
     volumes:
       - .:/app
     environment:
       RAILS_ENV: production
+      REDIS_URL: redis://redis:6379/1
     depends_on:
       - redis