Commit 46745517 authored by Lee Brown's avatar Lee Brown

Merge branch 'master' of gitlab.com:geeks-accelerator/oss/saas-starter-kit

parents 9b317695 ea6ea009
......@@ -5,7 +5,7 @@ services:
variables:
DOCKER_TLS_CERTDIR: ""
GIT_DEPTH: "1"
stages:
- setup:dev
- build:dev
......
......@@ -66,7 +66,7 @@ services:
target: dev
dockerfile: cmd/web-app/Dockerfile
args:
service: 'web-app'
name: 'web-app'
volumes:
- ./:/go/src/gitlab.com/geeks-accelerator/oss/saas-starter-kit
ports:
......@@ -76,6 +76,10 @@ services:
main:
aliases:
- web-app
depends_on:
- postgres
- redis
- datadog
env_file:
- configs/.env_docker_compose
environment:
......@@ -101,7 +105,7 @@ services:
target: dev
dockerfile: cmd/web-api/Dockerfile
args:
service: 'web-api'
name: 'web-api'
volumes:
- ./:/go/src/gitlab.com/geeks-accelerator/oss/saas-starter-kit
ports:
......@@ -111,6 +115,10 @@ services:
main:
aliases:
- web-api
depends_on:
- postgres
- redis
- datadog
env_file:
- configs/.env_docker_compose
environment:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment