From ef2361ebc74926d72c1ed9c938630203472c15b9 Mon Sep 17 00:00:00 2001 From: Ernesto Tagwerker Date: Sat, 23 Apr 2022 22:24:50 -0400 Subject: [PATCH 1/2] This causes problems in docker+apple m1 More here: https://github.com/evilmartians/terraforming-rails/issues/34 --- config/environments/development.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/environments/development.rb b/config/environments/development.rb index 1311e3e4..366e75ad 100644 --- a/config/environments/development.rb +++ b/config/environments/development.rb @@ -57,5 +57,5 @@ # Use an evented file watcher to asynchronously detect changes in source code, # routes, locales, etc. This feature depends on the listen gem. - config.file_watcher = ActiveSupport::EventedFileUpdateChecker + # config.file_watcher = ActiveSupport::EventedFileUpdateChecker end From f59882dae951c359f52870a4c50d902fd81fe607 Mon Sep 17 00:00:00 2001 From: Ernesto Tagwerker Date: Sat, 23 Apr 2022 22:25:11 -0400 Subject: [PATCH 2/2] Make sure we use amd64 for Mac OS X M1 compatibility --- docker-compose.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index 67bb5790..447d2682 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,7 +1,7 @@ version: '3' volumes: - bundle: + bundle: driver: local services: @@ -11,6 +11,7 @@ services: POSTGRES_PASSWORD: uaI7m2kmWd949DMv4dCh web: + platform: linux/amd64 environment: PGPASSWORD: uaI7m2kmWd949DMv4dCh build: .