Interpolate API_PORT into docker-compose.yml. Fixes #1598
parent
d99f598784
commit
7676370be0
|
@ -46,8 +46,9 @@ module FarmBot
|
||||||
max_age: 0
|
max_age: 0
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
API_PORT = ENV["API_PORT"]
|
||||||
Rails.application.routes.default_url_options[:host] = LOCAL_API_HOST
|
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]}"
|
$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(","))
|
ALL_LOCAL_URIS = ([ENV["API_HOST"]] + (ENV["EXTRA_DOMAINS"] || "").split(","))
|
||||||
|
@ -70,10 +71,10 @@ module FarmBot
|
||||||
"api.rollbar.com",
|
"api.rollbar.com",
|
||||||
PARCELJS_URL,
|
PARCELJS_URL,
|
||||||
ENV["FORCE_SSL"] ? "wss:" : "ws:",
|
ENV["FORCE_SSL"] ? "wss:" : "ws:",
|
||||||
"localhost:3000",
|
"localhost:#{API_PORT}",
|
||||||
"localhost:3808",
|
"localhost:3808",
|
||||||
"browser-http-intake.logs.datadoghq.com",
|
"browser-http-intake.logs.datadoghq.com",
|
||||||
"#{ENV.fetch("API_HOST")}:3000",
|
"#{ENV.fetch("API_HOST")}:#{API_PORT}",
|
||||||
"#{ENV.fetch("API_HOST")}:3808",
|
"#{ENV.fetch("API_HOST")}:3808",
|
||||||
]
|
]
|
||||||
config.csp = {
|
config.csp = {
|
||||||
|
|
|
@ -52,8 +52,8 @@ services:
|
||||||
context: "."
|
context: "."
|
||||||
dockerfile: docker_configs/api.Dockerfile
|
dockerfile: docker_configs/api.Dockerfile
|
||||||
command: bash -c "rm -f tmp/pids/server.pid && bundle exec rails s -e development
|
command: bash -c "rm -f tmp/pids/server.pid && bundle exec rails s -e development
|
||||||
-p 3000 -b 0.0.0.0"
|
-p ${API_PORT} -b 0.0.0.0"
|
||||||
ports: ["3000:3000"]
|
ports: ["${API_PORT}:${API_PORT}"]
|
||||||
|
|
||||||
mqtt:
|
mqtt:
|
||||||
env_file: ".env"
|
env_file: ".env"
|
||||||
|
|
Loading…
Reference in New Issue