From 124e6825ff3f3f90e0f1fa7e8ca4c80c576db027 Mon Sep 17 00:00:00 2001 From: knoflook Date: Tue, 7 Oct 2025 15:23:40 +0200 Subject: [PATCH] broken commit for testing purposes --- abra.sh | 2 +- compose.yml | 13 ++++++------- entrypoint-minio-bootstrap.sh.tmpl | 6 ++++-- 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/abra.sh b/abra.sh index 43d2809..b899847 100755 --- a/abra.sh +++ b/abra.sh @@ -4,7 +4,7 @@ export NGINX_CONF_VERSION=v2 export PG_BACKUP_VERSION=v3 export MINIO_ENTRYPOINT_VERSION=v1 -export MINIO_BOOTSTRAP_ENTRYPOINT_VERSION=v1 +export MINIO_BOOTSTRAP_ENTRYPOINT_VERSION=v8 export YPROVIDER_ENTRYPOINT_VERSION=v1 export BACKEND_ENTRYPOINT_VERSION=v1 export CELERY_ENTRYPOINT_VERSION=v1 diff --git a/compose.yml b/compose.yml index d06861d..d155e96 100644 --- a/compose.yml +++ b/compose.yml @@ -21,8 +21,7 @@ x-common-env: &common-env DJANGO_EMAIL_LOGO_IMG: DJANGO_EMAIL_PORT: DJANGO_EMAIL_HOST_USER: - DJANGO_EMAIL_HOST_PASSWORD_FILE: - # /run/secrets/django_email_host_password + DJANGO_EMAIL_HOST_PASSWORD_FILE: /run/secrets/django_email_host_password # Backend url IMPRESS_BASE_URL: "https://${DOMAIN}" # Media @@ -105,7 +104,7 @@ services: - oidc_rp_client_secret - django_secret_key - django_superuser_password - #- django_email_host_password + - django_email_host_password healthcheck: test: ["CMD", "python", "manage.py", "check"] interval: 15s @@ -127,7 +126,7 @@ services: - aws_s3_secret_access_key - oidc_rp_client_secret - django_secret_key - #- django_email_host_password + - django_email_host_password y-provider: image: lasuite/impress-y-provider:v3.6.0 @@ -287,6 +286,6 @@ secrets: django_superuser_password: name: ${STACK_NAME}_django_superuser_password_${SECRET_DJANGO_SUPERUSER_PASSWORD_VERSION} external: true -# django_email_host_password: -# name: ${STACK_NAME}_django_email_host_passsword_${SECRET_DJANGO_EMAIL_HOST_PASSWORD_VERSION} -# external: true + django_email_host_password: + name: ${STACK_NAME}_django_email_host_passsword_${SECRET_DJANGO_EMAIL_HOST_PASSWORD_VERSION} + external: true diff --git a/entrypoint-minio-bootstrap.sh.tmpl b/entrypoint-minio-bootstrap.sh.tmpl index af7fdeb..a5547de 100644 --- a/entrypoint-minio-bootstrap.sh.tmpl +++ b/entrypoint-minio-bootstrap.sh.tmpl @@ -30,8 +30,10 @@ set -eu load_vars set +eu +set -x -/usr/bin/mc alias set docs http://minio:9000 $${MINIO_ROOT_USER} $${MINIO_ROOT_PASSWORD} +/usr/bin/mc alias set docs http://minio:9000 $MINIO_ROOT_USER $MINIO_ROOT_PASSWORD --api S3v4 /usr/bin/mc mb --ignore-existing docs/docs-media-storage -/usr/bin/mc version enable docs/docs-media-storage +/usr/bin/mc mb version enable docs/docs-media-storage + exit 0