From 7eba98aed86519cc2cc1b0910e57ed6fdfd5f710 Mon Sep 17 00:00:00 2001 From: jsign Date: Tue, 27 Aug 2019 20:23:33 -0300 Subject: [PATCH 1/2] gitlab.cicd: shallow clone --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0183ead..596334a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -5,7 +5,7 @@ services: variables: DOCKER_TLS_CERTDIR: "" - + GIT_DEPTH: "1" stages: - setup:dev - build:dev From 19cafa33325b09201d6eb5756b37c0a982cf3625 Mon Sep 17 00:00:00 2001 From: jsign Date: Tue, 27 Aug 2019 22:05:26 -0300 Subject: [PATCH 2/2] docker-compose: fix args and add depends_on --- docker-compose.yaml | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/docker-compose.yaml b/docker-compose.yaml index b11277c..3b52f28 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -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: