Merge pull request #54 from TouchBistro/add-ias

Add infrastructure auth service
TouchBistro · Jul 19, 2019 · 5178030 · 5178030
2 parents 69e045e + 95c284b
commit 5178030
Show file tree

Hide file tree

Showing 3 changed files with 42 additions and 4 deletions.
diff --git a/static/docker-compose.yml b/static/docker-compose.yml
@@ -490,6 +490,7 @@ x-venue-admin-frontend-boilerplate:
     - CORE_BACKEND_URL_BASE=http://${VENUE_CORE_SERVICE_NAME}:8080
     - TOUCHBISTRO_PARTNER_CONFIG_URL_BASE=http://${PARTNERS_CONFIG_SERVICE_NAME}:8080
     - TOUCHBISTRO_LEGACY_BRIDGE_API_URL_BASE=http://${LEGACY_BRIDGE_CLOUD_SERVICE_NAME}:8080
+    - INFRASTRUCTURE_AUTH_SERVICE_URL=http://${INFRASTRUCTURE_AUTH_SERVICE_NAME}:8080
     - HTTP_PORT=9002   # VAF will default to :5000 for local server development.
     - NODE_ENV=production
   ports:
@@ -503,6 +504,19 @@ x-venue-admin-frontend-boilerplate:
     - $LEGACY_BRIDGE_CLOUD_SERVICE_NAME
     - $PARTNERS_CONFIG_SERVICE_NAME
 
+x-infrastructure-auth-service-boilerplate:
+  &infrastructure-auth-service-boilerplate
+  env_file:
+    - $TB_ROOT/infrastructure-auth-service/.env.example
+  entrypoint: ["bash", "./docker-entrypoint.sh"]
+  environment:
+    << : *node-service
+    << : *postgres-connect
+  ports:
+    - "8073:8080"
+  depends_on:
+    - postgres
+
 ###### SERVICES ######
 
 services:
@@ -944,6 +958,12 @@ services:
       - $TB_ROOT/venue-upload-service:/home/node/app:delegated
       - venue-upload-service-node_modules:/home/node/app/node_modules
 
+  venue-admin-frontend-ecr:
+    << : *venue-admin-frontend-boilerplate
+    image: $VENUE_ADMIN_FRONTEND_IMAGE_URI
+    container_name: venue-admin-frontend-ecr_container
+    << : *command-serve
+
   venue-admin-frontend:
     << : *venue-admin-frontend-boilerplate
     build:
@@ -957,12 +977,23 @@ services:
         # - SSO_INSECURE_BACKDOOR_DO_NOT_USE_ANYWHERE_BUT_LOCALHOST==insecure
     container_name: venue-admin-frontend_container
 
-  venue-admin-frontend-ecr:
-    << : *venue-admin-frontend-boilerplate
-    image: $VENUE_ADMIN_FRONTEND_IMAGE_URI
-    container_name: venue-admin-frontend-ecr_container
+  infrastructure-auth-service-ecr:
+    << : *infrastructure-auth-service-boilerplate
+    image: $INFRASTRUCTURE_AUTH_SERVICE_IMAGE_URI
+    container_name: infrastructure-devtools_infrastructure-auth-service-ecr_container
     << : *command-serve
 
+  infrastructure-auth-service:
+    << : *infrastructure-auth-service-boilerplate
+    build:
+      << : *build-node-dev
+      context: $TB_ROOT/infrastructure-auth-service
+    image: infrastructure-devtools_infrastructure-auth-service
+    container_name: infrastructure-devtools_infrastructure-auth-service_container
+    << : *command-start
+    volumes:
+      - $TB_ROOT/infrastructure-auth-service:/home/node/app:delegated
+
 ###### VOLUMES ######
 
 volumes:
@@ -980,3 +1011,4 @@ volumes:
   partners-orchestration-service-node_modules:
   partners-reservations-service-node_modules:
   venue-upload-service-node_modules:
+  infrastructure-auth-service-node_modules:
diff --git a/static/playlists.yml b/static/playlists.yml
@@ -56,6 +56,7 @@ vaf-deps:
     - cloud-server-frontend
     - legacy-bridge-cloud-service
     - partners-config-service
+    - infrastructure-auth-service
 vaf:
   extends: vaf-deps
   services:

diff --git a/static/services.yml b/static/services.yml
@@ -114,3 +114,8 @@ partners-reservations-service:
   migrations: true
   ecr: true
   ecrTag: master
+infrastructure-auth-service:
+  repo: true
+  migrations: true
+  ecr: true
+  ecrTag: master