Interpolate API_PORT into docker-compose.yml. Fixes #1598

config/application.rb

@@ -46,8 +46,9 @@ module FarmBot
                  max_age: 0
       end
     end
+    API_PORT = ENV["API_PORT"]
     Rails.application.routes.default_url_options[:host] = LOCAL_API_HOST
-    Rails.application.routes.default_url_options[:port] = ENV["API_PORT"] || 3000
+    Rails.application.routes.default_url_options[:port] = API_PORT || 3000
     # ¯\_(ツ)_/¯
     $API_URL = "//#{Rails.application.routes.default_url_options[:host]}:#{Rails.application.routes.default_url_options[:port]}"
     ALL_LOCAL_URIS = ([ENV["API_HOST"]] + (ENV["EXTRA_DOMAINS"] || "").split(","))
@@ -70,10 +71,10 @@ module FarmBot
         "api.rollbar.com",
         PARCELJS_URL,
         ENV["FORCE_SSL"] ? "wss:" : "ws:",
-        "localhost:3000",
+        "localhost:#{API_PORT}",
         "localhost:3808",
         "browser-http-intake.logs.datadoghq.com",
-        "#{ENV.fetch("API_HOST")}:3000",
+        "#{ENV.fetch("API_HOST")}:#{API_PORT}",
         "#{ENV.fetch("API_HOST")}:3808",
       ]
       config.csp = {

docker-compose.yml

@@ -52,8 +52,8 @@ services:
       context: "."
       dockerfile: docker_configs/api.Dockerfile
     command: bash -c "rm -f tmp/pids/server.pid && bundle exec rails s -e development
-      -p 3000 -b 0.0.0.0"
-    ports: ["3000:3000"]
+      -p ${API_PORT} -b 0.0.0.0"
+    ports: ["${API_PORT}:${API_PORT}"]
 
   mqtt:
     env_file: ".env"