From f6581fb66849f18017a1b3f318df6d8fd065472e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Denquin?= Date: Mon, 8 Aug 2022 10:56:21 +0200 Subject: [PATCH] fix: remove warning about docker empty var for dev env (#85) * fix: remove warning about docker empty var for dev env * disable segment var is back * disable segment for all dev services * initialize disable segment to empty string --- api | 2 +- docker-compose.dev.yml | 32 +++++++++++++++++--------------- front | 2 +- 3 files changed, 19 insertions(+), 17 deletions(-) diff --git a/api b/api index 59f1241..bd3b211 160000 --- a/api +++ b/api @@ -1 +1 @@ -Subproject commit 59f12418c9fc92b660b1ca69bad4b961af79801a +Subproject commit bd3b2116fc900147942df4439e24a4ea0619a98d diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml index 3b4fa61..3561a68 100644 --- a/docker-compose.dev.yml +++ b/docker-compose.dev.yml @@ -65,7 +65,7 @@ services: - API_URL=https://api.lago.dev - APP_DOMAIN=https://app.lago.dev - CODEGEN_API=https://api.lago.dev:3000 - - LAGO_DISABLE_SIGNUP=${LAGO_DISABLE_SIGNUP} + - LAGO_DISABLE_SIGNUP=${LAGO_DISABLE_SIGNUP:-} labels: - "traefik.enable=true" - "traefik.http.routers.app.rule=Host(`app.lago.dev`)" @@ -92,15 +92,15 @@ services: - ENCRYPTION_PRIMARY_KEY=${ENCRYPTION_PRIMARY_KEY:-your-encrpytion-primary-key} - ENCRYPTION_DETERMINISTIC_KEY=${ENCRYPTION_DETERMINISTIC_KEY:-your-encrpytion-deterministic-key} - ENCRYPTION_KEY_DERIVATION_SALT=${ENCRYPTION_KEY_DERIVATION_SALT:-your-encrpytion-derivation-salt} - - LAGO_USE_AWS_S3=${LAGO_USE_AWS_S3} - - LAGO_AWS_S3_ACCESS_KEY_ID=${LAGO_AWS_S3_ACCESS_KEY_ID} - - LAGO_AWS_S3_SECRET_ACCESS_KEY=${LAGO_AWS_S3_SECRET_ACCESS_KEY} - - LAGO_AWS_S3_REGION=${LAGO_AWS_S3_REGION} - - LAGO_AWS_S3_BUCKET=${LAGO_AWS_S3_BUCKET} + - LAGO_USE_AWS_S3=${LAGO_USE_AWS_S3:-false} + - LAGO_AWS_S3_ACCESS_KEY_ID=${LAGO_AWS_S3_ACCESS_KEY_ID:-} + - LAGO_AWS_S3_SECRET_ACCESS_KEY=${LAGO_AWS_S3_SECRET_ACCESS_KEY:-} + - LAGO_AWS_S3_REGION=${LAGO_AWS_S3_REGION:-} + - LAGO_AWS_S3_BUCKET=${LAGO_AWS_S3_BUCKET:-} - LAGO_PDF_URL=${LAGO_PDF_URL:-http://pdf:3000} - LAGO_REDIS_CACHE_URL=redis://redis:6379 - - SEGMENT_WRITE_KEY=${SEGMENT_WRITE_KEY} - - LAGO_DISABLE_SEGMENT=${LAGO_DISABLE_SEGMENT} + - SEGMENT_WRITE_KEY=${SEGMENT_WRITE_KEY:-} + - LAGO_DISABLE_SEGMENT=${LAGO_DISABLE_SEGMENT:-} labels: - "traefik.enable=true" - "traefik.http.routers.api_http.rule=Host(`api.lago.dev`)" @@ -131,14 +131,15 @@ services: - ENCRYPTION_PRIMARY_KEY=${ENCRYPTION_PRIMARY_KEY:-your-encrpytion-primary-key} - ENCRYPTION_DETERMINISTIC_KEY=${ENCRYPTION_DETERMINISTIC_KEY:-your-encrpytion-deterministic-key} - ENCRYPTION_KEY_DERIVATION_SALT=${ENCRYPTION_KEY_DERIVATION_SALT:-your-encrpytion-derivation-salt} - - LAGO_USE_AWS_S3=${LAGO_USE_AWS_S3} - - LAGO_AWS_S3_ACCESS_KEY_ID=${LAGO_AWS_S3_ACCESS_KEY_ID} - - LAGO_AWS_S3_SECRET_ACCESS_KEY=${LAGO_AWS_S3_SECRET_ACCESS_KEY} - - LAGO_AWS_S3_REGION=${LAGO_AWS_S3_REGION} - - LAGO_AWS_S3_BUCKET=${LAGO_AWS_S3_BUCKET} + - LAGO_USE_AWS_S3=${LAGO_USE_AWS_S3:-false} + - LAGO_AWS_S3_ACCESS_KEY_ID=${LAGO_AWS_S3_ACCESS_KEY_ID:-} + - LAGO_AWS_S3_SECRET_ACCESS_KEY=${LAGO_AWS_S3_SECRET_ACCESS_KEY:-} + - LAGO_AWS_S3_REGION=${LAGO_AWS_S3_REGION:-} + - LAGO_AWS_S3_BUCKET=${LAGO_AWS_S3_BUCKET:-} - LAGO_PDF_URL=${LAGO_PDF_URL:-http://pdf:3000} - LAGO_REDIS_CACHE_URL=redis://redis:6379 - - SEGMENT_WRITE_KEY=${SEGMENT_WRITE_KEY} + - SEGMENT_WRITE_KEY=${SEGMENT_WRITE_KEY:-} + - LAGO_DISABLE_SEGMENT=${LAGO_DISABLE_SEGMENT:-} api-clock: image: api @@ -158,7 +159,8 @@ services: - ENCRYPTION_PRIMARY_KEY=${ENCRYPTION_PRIMARY_KEY:-your-encrpytion-primary-key} - ENCRYPTION_DETERMINISTIC_KEY=${ENCRYPTION_DETERMINISTIC_KEY:-your-encrpytion-deterministic-key} - ENCRYPTION_KEY_DERIVATION_SALT={ENCRYPTION_KEY_DERIVATION_SALT:-your-encrpytion-derivation-salt} - - SEGMENT_WRITE_KEY=${SEGMENT_WRITE_KEY} + - SEGMENT_WRITE_KEY=${SEGMENT_WRITE_KEY:-} + - LAGO_DISABLE_SEGMENT=${LAGO_DISABLE_SEGMENT:-} pdf: image: gotenberg/gotenberg:7 diff --git a/front b/front index 9ff36b4..6e4fa05 160000 --- a/front +++ b/front @@ -1 +1 @@ -Subproject commit 9ff36b4540d8cbe1100b1eae198c88cb7b2b6bb1 +Subproject commit 6e4fa05c061f05aeea1689c05d1372156dcc41ff