Update secrets list (#99)

monicahq · Jan 20, 2022 · 885b025 · 885b025
1 parent 0ecf5b8
commit 885b025
Show file tree

Hide file tree

Showing 7 changed files with 79 additions and 55 deletions.
diff --git a/apache/Dockerfile b/apache/Dockerfile
@@ -56,7 +56,7 @@ RUN set -ex; \
 # pecl will claim success even if one install fails, so we need to perform each install separately
     pecl install APCu-5.1.21; \
     pecl install memcached-3.1.5; \
-    pecl install redis-5.3.5; \
+    pecl install redis-5.3.6; \
     \
     docker-php-ext-enable \
         apcu \

diff --git a/apache/entrypoint.sh b/apache/entrypoint.sh
@@ -3,22 +3,28 @@
 set -Eeo pipefail
 
 # set environment variables with docker secrets in /run/secrets/*
-supportedSecrets=( "DB_PASSWORD" 
-                   "APP_KEY" 
-                   "HASH_SALT" 
-                   "MAIL_PASSWORD" 
-                   "REDIS_PASSWORD" 
-                   "AWS_KEY" 
-                   "AWS_SECRET" 
-                   "PASSPORT_PASSWORD_GRANT_CLIENT_ID" 
-                   "PASSPORT_PASSWORD_GRANT_CLIENT_SECRET" 
+supportedSecrets=( "DB_PASSWORD"
+                   "DATABASE_URL"
+                   "APP_KEY"
+                   "HASH_SALT"
+                   "MAIL_PASSWORD"
+                   "REDIS_PASSWORD"
+                   "AWS_ACCESS_KEY_ID"
+                   "AWS_SECRET_ACCESS_KEY"
+                   "AWS_KEY"
+                   "AWS_SECRET"
+                   "PASSPORT_PASSWORD_GRANT_CLIENT_ID"
+                   "PASSPORT_PASSWORD_GRANT_CLIENT_SECRET"
+                   "SENTRY_AUTH_TOKEN"
                    "LOCATION_IQ_API_KEY"
+                   "WEATHERAPI_KEY"
+                   "IPDATA_TOKEN"
                   )
-for secret in ${supportedSecrets[@]}; do
+
+for secret in "${supportedSecrets[@]}"; do
     envFile="${secret}_FILE"
-    if [ $(printenv ${envFile}) ]; then envFileName=`printenv ${envFile}`; fi
-    if [[ ${!envFile} && -f "$envFileName" ]]; then
-        val=`cat $envFileName`
+    if [ -n "${!envFile}" ] && [ -f "${!envFile}" ]; then
+        val="$(< "${!envFile}")"
         export "${secret}"="$val"
         echo "${secret} environment variable was set by secret ${envFile}"
     fi

diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh
@@ -3,22 +3,28 @@
 set -Eeo pipefail
 
 # set environment variables with docker secrets in /run/secrets/*
-supportedSecrets=( "DB_PASSWORD" 
-                   "APP_KEY" 
-                   "HASH_SALT" 
-                   "MAIL_PASSWORD" 
-                   "REDIS_PASSWORD" 
-                   "AWS_KEY" 
-                   "AWS_SECRET" 
-                   "PASSPORT_PASSWORD_GRANT_CLIENT_ID" 
-                   "PASSPORT_PASSWORD_GRANT_CLIENT_SECRET" 
+supportedSecrets=( "DB_PASSWORD"
+                   "DATABASE_URL"
+                   "APP_KEY"
+                   "HASH_SALT"
+                   "MAIL_PASSWORD"
+                   "REDIS_PASSWORD"
+                   "AWS_ACCESS_KEY_ID"
+                   "AWS_SECRET_ACCESS_KEY"
+                   "AWS_KEY"
+                   "AWS_SECRET"
+                   "PASSPORT_PASSWORD_GRANT_CLIENT_ID"
+                   "PASSPORT_PASSWORD_GRANT_CLIENT_SECRET"
+                   "SENTRY_AUTH_TOKEN"
                    "LOCATION_IQ_API_KEY"
+                   "WEATHERAPI_KEY"
+                   "IPDATA_TOKEN"
                   )
-for secret in ${supportedSecrets[@]}; do
+
+for secret in "${supportedSecrets[@]}"; do
     envFile="${secret}_FILE"
-    if [ $(printenv ${envFile}) ]; then envFileName=`printenv ${envFile}`; fi
-    if [[ ${!envFile} && -f "$envFileName" ]]; then
-        val=`cat $envFileName`
+    if [ -n "${!envFile}" ] && [ -f "${!envFile}" ]; then
+        val="$(< "${!envFile}")"
         export "${secret}"="$val"
         echo "${secret} environment variable was set by secret ${envFile}"
     fi

diff --git a/fpm-alpine/Dockerfile b/fpm-alpine/Dockerfile
@@ -49,7 +49,7 @@ RUN set -ex; \
 # pecl will claim success even if one install fails, so we need to perform each install separately
     pecl install APCu-5.1.21; \
     pecl install memcached-3.1.5; \
-    pecl install redis-5.3.5; \
+    pecl install redis-5.3.6; \
     \
     docker-php-ext-enable \
         apcu \

diff --git a/fpm-alpine/entrypoint.sh b/fpm-alpine/entrypoint.sh
@@ -3,22 +3,28 @@
 set -Eeo pipefail
 
 # set environment variables with docker secrets in /run/secrets/*
-supportedSecrets=( "DB_PASSWORD" 
-                   "APP_KEY" 
-                   "HASH_SALT" 
-                   "MAIL_PASSWORD" 
-                   "REDIS_PASSWORD" 
-                   "AWS_KEY" 
-                   "AWS_SECRET" 
-                   "PASSPORT_PASSWORD_GRANT_CLIENT_ID" 
-                   "PASSPORT_PASSWORD_GRANT_CLIENT_SECRET" 
+supportedSecrets=( "DB_PASSWORD"
+                   "DATABASE_URL"
+                   "APP_KEY"
+                   "HASH_SALT"
+                   "MAIL_PASSWORD"
+                   "REDIS_PASSWORD"
+                   "AWS_ACCESS_KEY_ID"
+                   "AWS_SECRET_ACCESS_KEY"
+                   "AWS_KEY"
+                   "AWS_SECRET"
+                   "PASSPORT_PASSWORD_GRANT_CLIENT_ID"
+                   "PASSPORT_PASSWORD_GRANT_CLIENT_SECRET"
+                   "SENTRY_AUTH_TOKEN"
                    "LOCATION_IQ_API_KEY"
+                   "WEATHERAPI_KEY"
+                   "IPDATA_TOKEN"
                   )
-for secret in ${supportedSecrets[@]}; do
+
+for secret in "${supportedSecrets[@]}"; do
     envFile="${secret}_FILE"
-    if [ $(printenv ${envFile}) ]; then envFileName=`printenv ${envFile}`; fi
-    if [[ ${!envFile} && -f "$envFileName" ]]; then
-        val=`cat $envFileName`
+    if [ -n "${!envFile}" ] && [ -f "${!envFile}" ]; then
+        val="$(< "${!envFile}")"
         export "${secret}"="$val"
         echo "${secret} environment variable was set by secret ${envFile}"
     fi

diff --git a/fpm/Dockerfile b/fpm/Dockerfile
@@ -56,7 +56,7 @@ RUN set -ex; \
 # pecl will claim success even if one install fails, so we need to perform each install separately
     pecl install APCu-5.1.21; \
     pecl install memcached-3.1.5; \
-    pecl install redis-5.3.5; \
+    pecl install redis-5.3.6; \
     \
     docker-php-ext-enable \
         apcu \

diff --git a/fpm/entrypoint.sh b/fpm/entrypoint.sh
@@ -3,22 +3,28 @@
 set -Eeo pipefail
 
 # set environment variables with docker secrets in /run/secrets/*
-supportedSecrets=( "DB_PASSWORD" 
-                   "APP_KEY" 
-                   "HASH_SALT" 
-                   "MAIL_PASSWORD" 
-                   "REDIS_PASSWORD" 
-                   "AWS_KEY" 
-                   "AWS_SECRET" 
-                   "PASSPORT_PASSWORD_GRANT_CLIENT_ID" 
-                   "PASSPORT_PASSWORD_GRANT_CLIENT_SECRET" 
+supportedSecrets=( "DB_PASSWORD"
+                   "DATABASE_URL"
+                   "APP_KEY"
+                   "HASH_SALT"
+                   "MAIL_PASSWORD"
+                   "REDIS_PASSWORD"
+                   "AWS_ACCESS_KEY_ID"
+                   "AWS_SECRET_ACCESS_KEY"
+                   "AWS_KEY"
+                   "AWS_SECRET"
+                   "PASSPORT_PASSWORD_GRANT_CLIENT_ID"
+                   "PASSPORT_PASSWORD_GRANT_CLIENT_SECRET"
+                   "SENTRY_AUTH_TOKEN"
                    "LOCATION_IQ_API_KEY"
+                   "WEATHERAPI_KEY"
+                   "IPDATA_TOKEN"
                   )
-for secret in ${supportedSecrets[@]}; do
+
+for secret in "${supportedSecrets[@]}"; do
     envFile="${secret}_FILE"
-    if [ $(printenv ${envFile}) ]; then envFileName=`printenv ${envFile}`; fi
-    if [[ ${!envFile} && -f "$envFileName" ]]; then
-        val=`cat $envFileName`
+    if [ -n "${!envFile}" ] && [ -f "${!envFile}" ]; then
+        val="$(< "${!envFile}")"
         export "${secret}"="$val"
         echo "${secret} environment variable was set by secret ${envFile}"
     fi