From 8f3aa57f0855a8e2a162b4cf42d1a59b8b0169ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Denquin?= Date: Wed, 30 Nov 2022 20:08:06 +0100 Subject: [PATCH] misc(docker): Add Redis password support (#143) --- api | 2 +- docker-compose.arm64.yml | 11 ++++++++--- docker-compose.yml | 11 ++++++++--- front | 2 +- 4 files changed, 18 insertions(+), 8 deletions(-) diff --git a/api b/api index 33a45b8..f32b9a8 160000 --- a/api +++ b/api @@ -1 +1 @@ -Subproject commit 33a45b891b654be1a8ae6e6a0daa53e018611440 +Subproject commit f32b9a856bc8216171265c0e68fa4477ac3593e3 diff --git a/docker-compose.arm64.yml b/docker-compose.arm64.yml index 0005e28..c36aadf 100644 --- a/docker-compose.arm64.yml +++ b/docker-compose.arm64.yml @@ -30,7 +30,7 @@ services: api: container_name: lago-api - image: getlago/api-arm64v8:v0.16.0-alpha + image: getlago/api-arm64v8:v0.16.1-alpha restart: unless-stopped depends_on: - db @@ -40,6 +40,7 @@ services: - LAGO_API_URL=${LAGO_API_URL:-http://localhost:3000} - DATABASE_URL=postgresql://${POSTGRES_USER:-lago}:${POSTGRES_PASSWORD:-changeme}@${POSTGRES_HOST:-db}:${POSTGRES_PORT:-5432}/${POSTGRES_DB:-lago} - REDIS_URL=redis://${REDIS_HOST:-redis}:${REDIS_PORT:-6379} + - REDIS_PASSWORD=${REDIS_PASSWORD} - SECRET_KEY_BASE=${SECRET_KEY_BASE:-your-secret-key-base-hex-64} - RAILS_ENV=production - SENTRY_DSN=${SENTRY_DSN} @@ -61,6 +62,7 @@ services: - LAGO_GCS_BUCKET=${LAGO_GCS_BUCKET:-} - LAGO_PDF_URL=${LAGO_PDF_URL:-http://pdf:3000} - LAGO_REDIS_CACHE_URL=redis://${LAGO_REDIS_CACHE_HOST:-redis}:${LAGO_REDIS_CACHE_PORT:-6379} + - LAGO_REDIS_CACHE_PASSWORD=${LAGO_REDIS_CACHE_PASSWORD} - LAGO_DISABLE_SEGMENT=${LAGO_DISABLE_SEGMENT} - GOCARDLESS_CLIENT_ID=${GOCARDLESS_CLIENT_ID} - GOCARDLESS_CLIENT_SECRET=${GOCARDLESS_CLIENT_SECRET} @@ -107,7 +109,7 @@ services: api-worker: container_name: lago-worker - image: getlago/api-arm64v8:v0.16.0-alpha + image: getlago/api-arm64v8:v0.16.1-alpha restart: unless-stopped depends_on: - api @@ -116,6 +118,7 @@ services: - LAGO_API_URL=${LAGO_API_URL:-http://localhost:3000} - DATABASE_URL=postgresql://${POSTGRES_USER:-lago}:${POSTGRES_PASSWORD:-changeme}@${POSTGRES_HOST:-db}:${POSTGRES_PORT:-5432}/${POSTGRES_DB:-lago} - REDIS_URL=redis://${REDIS_HOST:-redis}:${REDIS_PORT:-6379} + - REDIS_PASSWORD=${REDIS_PASSWORD} - SECRET_KEY_BASE=${SECRET_KEY_BASE:-your-secret-key-base-hex-64} - RAILS_ENV=production - SENTRY_DSN=${SENTRY_DSN} @@ -135,13 +138,14 @@ services: - LAGO_GCS_BUCKET=${LAGO_GCS_BUCKET:-} - LAGO_PDF_URL=${LAGO_PDF_URL:-http://pdf:3000} - LAGO_REDIS_CACHE_URL=redis://${LAGO_REDIS_CACHE_HOST:-redis}:${LAGO_REDIS_CACHE_PORT:-6379} + - LAGO_REDIS_CACHE_PASSWORD=${LAGO_REDIS_CACHE_PASSWORD} - LAGO_DISABLE_SEGMENT=${LAGO_DISABLE_SEGMENT} - GOCARDLESS_CLIENT_ID=${GOCARDLESS_CLIENT_ID} - GOCARDLESS_CLIENT_SECRET=${GOCARDLESS_CLIENT_SECRET} api-clock: container_name: lago-clock - image: getlago/api-arm64v8:v0.16.0-alpha + image: getlago/api-arm64v8:v0.16.1-alpha restart: unless-stopped depends_on: - api @@ -150,6 +154,7 @@ services: - LAGO_API_URL=${LAGO_API_URL:-http://localhost:3000} - DATABASE_URL=postgresql://${POSTGRES_USER:-lago}:${POSTGRES_PASSWORD:-changeme}@${POSTGRES_HOST:-db}:${POSTGRES_PORT:-5432}/${POSTGRES_DB:-lago} - REDIS_URL=redis://${REDIS_HOST:-redis}:${REDIS_PORT:-6379} + - REDIS_PASSWORD=${REDIS_PASSWORD} - SECRET_KEY_BASE=${SECRET_KEY_BASE:-your-secret-key-base-hex-64} - RAILS_ENV=production - SENTRY_DSN=${SENTRY_DSN} diff --git a/docker-compose.yml b/docker-compose.yml index 401208c..6284ad6 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -31,7 +31,7 @@ services: api: container_name: lago-api - image: getlago/api:v0.16.0-alpha + image: getlago/api:v0.16.1-alpha restart: unless-stopped depends_on: - db @@ -41,6 +41,7 @@ services: - LAGO_API_URL=${LAGO_API_URL:-http://localhost:3000} - DATABASE_URL=postgresql://${POSTGRES_USER:-lago}:${POSTGRES_PASSWORD:-changeme}@${POSTGRES_HOST:-db}:${POSTGRES_PORT:-5432}/${POSTGRES_DB:-lago} - REDIS_URL=redis://${REDIS_HOST:-redis}:${REDIS_PORT:-6379} + - REDIS_PASSWORD=${REDIS_PASSWORD} - SECRET_KEY_BASE=${SECRET_KEY_BASE:-your-secret-key-base-hex-64} - RAILS_ENV=production - RAILS_LOG_TO_STDOUT=${LAGO_RAILS_STDOUT:-true} @@ -63,6 +64,7 @@ services: - LAGO_GCS_BUCKET=${LAGO_GCS_BUCKET:-} - LAGO_PDF_URL=${LAGO_PDF_URL:-http://pdf:3000} - LAGO_REDIS_CACHE_URL=redis://${LAGO_REDIS_CACHE_HOST:-redis}:${LAGO_REDIS_CACHE_PORT:-6379} + - LAGO_REDIS_CACHE_PASSWORD=${LAGO_REDIS_CACHE_PASSWORD} - LAGO_DISABLE_SEGMENT=${LAGO_DISABLE_SEGMENT} - GOCARDLESS_CLIENT_ID=${GOCARDLESS_CLIENT_ID} - GOCARDLESS_CLIENT_SECRET=${GOCARDLESS_CLIENT_SECRET} @@ -113,7 +115,7 @@ services: api-worker: container_name: lago-worker - image: getlago/api:v0.16.0-alpha + image: getlago/api:v0.16.1-alpha restart: unless-stopped depends_on: - api @@ -122,6 +124,7 @@ services: - LAGO_API_URL=${LAGO_API_URL:-http://localhost:3000} - DATABASE_URL=postgresql://${POSTGRES_USER:-lago}:${POSTGRES_PASSWORD:-changeme}@${POSTGRES_HOST:-db}:${POSTGRES_PORT:-5432}/${POSTGRES_DB:-lago} - REDIS_URL=redis://${REDIS_HOST:-redis}:${REDIS_PORT:-6379} + - REDIS_PASSWORD=${REDIS_PASSWORD} - SECRET_KEY_BASE=${SECRET_KEY_BASE:-your-secret-key-base-hex-64} - RAILS_ENV=production - RAILS_LOG_TO_STDOUT=${LAGO_RAILS_STDOUT:-true} @@ -142,6 +145,7 @@ services: - LAGO_GCS_BUCKET=${LAGO_GCS_BUCKET:-} - LAGO_PDF_URL=${LAGO_PDF_URL:-http://pdf:3000} - LAGO_REDIS_CACHE_URL=redis://${LAGO_REDIS_CACHE_HOST:-redis}:${LAGO_REDIS_CACHE_PORT:-6379} + - LAGO_REDIS_CACHE_PASSWORD=${LAGO_REDIS_CACHE_PASSWORD} - LAGO_DISABLE_SEGMENT=${LAGO_DISABLE_SEGMENT} - GOCARDLESS_CLIENT_ID=${GOCARDLESS_CLIENT_ID} - GOCARDLESS_CLIENT_SECRET=${GOCARDLESS_CLIENT_SECRET} @@ -150,7 +154,7 @@ services: api-clock: container_name: lago-clock - image: getlago/api:v0.16.0-alpha + image: getlago/api:v0.16.1-alpha restart: unless-stopped depends_on: - api @@ -159,6 +163,7 @@ services: - LAGO_API_URL=${LAGO_API_URL:-http://localhost:3000} - DATABASE_URL=postgresql://${POSTGRES_USER:-lago}:${POSTGRES_PASSWORD:-changeme}@${POSTGRES_HOST:-db}:${POSTGRES_PORT:-5432}/${POSTGRES_DB:-lago} - REDIS_URL=redis://${REDIS_HOST:-redis}:${REDIS_PORT:-6379} + - REDIS_PASSWORD=${REDIS_PASSWORD} - SECRET_KEY_BASE=${SECRET_KEY_BASE:-your-secret-key-base-hex-64} - RAILS_ENV=production - RAILS_LOG_TO_STDOUT=${LAGO_RAILS_STDOUT:-true} diff --git a/front b/front index f1d3c60..8b49350 160000 --- a/front +++ b/front @@ -1 +1 @@ -Subproject commit f1d3c609bb2854957622a8e8870a9c6989121a48 +Subproject commit 8b493503de0f52571a26786eaf4106cb45cb6961