From 84a09b20f38275b494c07d3f581e0a46e3959cce Mon Sep 17 00:00:00 2001 From: Olivier Pichon <203745+opichon@users.noreply.github.com> Date: Sun, 9 May 2021 11:02:56 +0700 Subject: [PATCH 1/2] Update docker-entrypoint.sh --- strapi/docker-entrypoint.sh | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/strapi/docker-entrypoint.sh b/strapi/docker-entrypoint.sh index 73dfccf..8ee88ee 100755 --- a/strapi/docker-entrypoint.sh +++ b/strapi/docker-entrypoint.sh @@ -1,6 +1,13 @@ #!/bin/sh set -ea +# Allow sensitive settings to be defined in a file +# in order to support Docker secrets +if [ -n "${DATABASE__PASSWORD_FILE}" ]; then + DATABASE_PASSWORD=$(cat "$DATABASE_PASSWORD_FILE") + export DATABASE_PASSWORD +fi + if [ "$1" = "strapi" ]; then if [ ! -f "package.json" ]; then From 85c6e3da0634ef8edb5504352971b0f2a45db5e6 Mon Sep 17 00:00:00 2001 From: Olivier Pichon <203745+opichon@users.noreply.github.com> Date: Sun, 9 May 2021 11:07:19 +0700 Subject: [PATCH 2/2] Update docker-entrypoint.sh --- strapi/docker-entrypoint.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/strapi/docker-entrypoint.sh b/strapi/docker-entrypoint.sh index 8ee88ee..3e59791 100755 --- a/strapi/docker-entrypoint.sh +++ b/strapi/docker-entrypoint.sh @@ -3,7 +3,7 @@ set -ea # Allow sensitive settings to be defined in a file # in order to support Docker secrets -if [ -n "${DATABASE__PASSWORD_FILE}" ]; then +if [ -n "${DATABASE_PASSWORD_FILE}" ]; then DATABASE_PASSWORD=$(cat "$DATABASE_PASSWORD_FILE") export DATABASE_PASSWORD fi