Merge branch 'feat/adding-username-field-to-user' of beep/backend into master

2019-06-18 13:59:19 +00:00 · 2019-06-18 13:59:19 +00:00 · d6652313df
parent 893a8b9339 e3d5fdd4f1
commit d6652313df
4 changed files with 8 additions and 3 deletions
--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit d84bde9b4d6cabe0ff2d1bfa82aae22cee83bd05
+Subproject commit 7ab43cf9f290e3e802d3b04e352e5c7db4b14170
--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit c6c1d0d160700d968b45083907e56b4dacd88e02
+Subproject commit 44c804061dcca62ea5254f8a40b42cb7bbead24a
--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit fe8ba2689fd3cd7f79a4502e958473e8ed5fc2ae
+Subproject commit a5540dff2283b4bc7e847962403d61f37a177816
--- a/docker-compose.yml
+++ b/docker-compose.yml
@ -88,6 +88,10 @@ services:
    build: ./backend-login
    tty: true
    restart: unless-stopped
+    depends_on:
+      - pg
+      - redis
+      - core
    environment:
      - LISTEN=:80
      - SECRET=secret
@ -97,6 +101,7 @@ services:
      - MESSAGING_SID=MG19d18fafcff1f3f34dff04c5b04c0699
      - TWILIO_SID=AC22ea3eea85e5108a96b947aea8ab1320
      - TWILIO_TOKEN=fb23fa1a1564aa9f62a7a3117f07b3a0
+      - CORE_URL=http://core/user
    networks:
      - traefiknet
      - redisnet