From df3f08c5285fdd895f61435675085c738bb3b6c0 Mon Sep 17 00:00:00 2001 From: Thomas Citharel Date: Wed, 25 Jul 2018 17:06:50 +0200 Subject: [PATCH] Fix Docker front and api ports Signed-off-by: Thomas Citharel --- config/dev.exs | 2 +- docker-compose.yml | 1 + js/.env | 3 --- js/.env.dist | 4 ++-- 4 files changed, 4 insertions(+), 6 deletions(-) delete mode 100644 js/.env diff --git a/config/dev.exs b/config/dev.exs index 6fecc0481..1eef56e7b 100644 --- a/config/dev.exs +++ b/config/dev.exs @@ -7,7 +7,7 @@ use Mix.Config # watchers to your application. For example, we use it # with brunch.io to recompile .js and .css sources. config :eventos, EventosWeb.Endpoint, - http: [port: 4001], + http: [port: System.get_env("PORT") || 4001], debug_errors: true, code_reloader: true, check_origin: false, diff --git a/docker-compose.yml b/docker-compose.yml index 0237d3f91..33b7f301c 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -35,4 +35,5 @@ services: POSTGRES_USER: postgres POSTGRES_DATABASE: eventos_dev POSTGRES_HOST: postgres + PORT: 4000 entrypoint: entrypoint diff --git a/js/.env b/js/.env deleted file mode 100644 index 01866b3c9..000000000 --- a/js/.env +++ /dev/null @@ -1,3 +0,0 @@ -API_HOST=localhost -API_ORIGIN=http://localhost:4001 -API_PATH=/api/v1 diff --git a/js/.env.dist b/js/.env.dist index 30dde71ce..7a1024727 100644 --- a/js/.env.dist +++ b/js/.env.dist @@ -1,3 +1,3 @@ -API_HOST=event.tcit.fr -API_ORIGIN=https://event.tcit.fr +API_HOST=eventos.tld +API_ORIGIN=https://eventos.tld API_PATH=/api/v1