Merge pull request #745 from alphagov/search-admin

Update `search-admin` config to reflect app changes
alphagov · May 7, 2024 · 661244b · 661244b
2 parents 140cddd + b243cd4
commit 661244b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/projects/search-admin/Makefile b/projects/search-admin/Makefile
@@ -1,4 +1,4 @@
-search-admin: bundle-search-admin publishing-api search-api
+search-admin: bundle-search-admin publishing-api
 	$(GOVUK_DOCKER) run $@-lite bin/rake db:prepare
 	$(GOVUK_DOCKER) run $@-lite env RAILS_ENV=test bin/rake db:prepare
 	$(GOVUK_DOCKER) run $@-lite bin/rails runner 'User.first || User.create'

diff --git a/projects/search-admin/docker-compose.yml b/projects/search-admin/docker-compose.yml
@@ -25,20 +25,20 @@ services:
       DATABASE_URL: "mysql2://root:root@mysql-8/search_admin_development"
       TEST_DATABASE_URL: "mysql2://root:root@mysql-8/search_admin_test"
       REDIS_URL: redis://redis
-      DATABASE_CLEANER_ALLOW_REMOTE_DATABASE_URL: "true"
 
   search-admin-app: &search-admin-app
     <<: *search-admin-base
     depends_on:
       - mysql-8
       - nginx-proxy
       - publishing-api-app
-      - search-api-app
     environment:
       DATABASE_URL: "mysql2://root:root@mysql-8/search_admin_development"
+      TEST_DATABASE_URL: "mysql2://root:root@mysql-8/search_admin_test"
       REDIS_URL: redis://redis
       VIRTUAL_HOST: search-admin.dev.gov.uk
       BINDING: 0.0.0.0
+      PORT: 3000
     expose:
       - "3000"
-    command: bin/rails s --restart
+    command: bin/dev