From db69f83accbbeb005a66cce750bb4825441f1f8b Mon Sep 17 00:00:00 2001 From: Felipe Nakandakari <76239+fenak@users.noreply.github.com> Date: Mon, 10 Jul 2023 19:08:14 +1000 Subject: [PATCH 1/2] Support more AWS related env vars --- etc/php/php-fpm.d/zz-docker.conf | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/etc/php/php-fpm.d/zz-docker.conf b/etc/php/php-fpm.d/zz-docker.conf index 31894ed..0924e6c 100644 --- a/etc/php/php-fpm.d/zz-docker.conf +++ b/etc/php/php-fpm.d/zz-docker.conf @@ -14,8 +14,17 @@ pm.max_spare_servers = 3 ; Amazon Web Services variables used with S3 backend env[AWS_ACCESS_KEY_ID] = $AWS_ACCESS_KEY_ID +env[AWS_CONTAINER_AUTHORIZATION_TOKEN] = $AWS_CONTAINER_AUTHORIZATION_TOKEN +env[AWS_CONTAINER_CREDENTIALS_FULL_URI] = $AWS_CONTAINER_CREDENTIALS_FULL_URI +env[AWS_CONTAINER_CREDENTIALS_RELATIVE_URI] = $AWS_CONTAINER_CREDENTIALS_RELATIVE_URI +env[AWS_PROFILE] = $AWS_PROFILE +env[AWS_ROLE_ARN] = $AWS_ROLE_ARN +env[AWS_ROLE_SESSION_NAME] = $AWS_ROLE_SESSION_NAME env[AWS_SECRET_ACCESS_KEY] = $AWS_SECRET_ACCESS_KEY env[AWS_SESSION_TOKEN] = $AWS_SESSION_TOKEN +env[AWS_STS_REGIONAL_ENDPOINTS] = $AWS_STS_REGIONAL_ENDPOINTS +env[AWS_WEB_IDENTITY_TOKEN_FILE] = $AWS_WEB_IDENTITY_TOKEN_FILE +env[AWS_SHARED_CREDENTIALS_FILE] = $AWS_SHARED_CREDENTIALS_FILE ; allows changing the default configuration path env[CONFIG_PATH] = $CONFIG_PATH From 16fb8caa2f0e4a739514b09fd917a6588acca972 Mon Sep 17 00:00:00 2001 From: Felipe Nakandakari <76239+fenak@users.noreply.github.com> Date: Mon, 10 Jul 2023 19:18:41 +1000 Subject: [PATCH 2/2] Add AWS_DEFAULT_REGION env var --- etc/php/php-fpm.d/zz-docker.conf | 1 + 1 file changed, 1 insertion(+) diff --git a/etc/php/php-fpm.d/zz-docker.conf b/etc/php/php-fpm.d/zz-docker.conf index 0924e6c..e4d38e9 100644 --- a/etc/php/php-fpm.d/zz-docker.conf +++ b/etc/php/php-fpm.d/zz-docker.conf @@ -17,6 +17,7 @@ env[AWS_ACCESS_KEY_ID] = $AWS_ACCESS_KEY_ID env[AWS_CONTAINER_AUTHORIZATION_TOKEN] = $AWS_CONTAINER_AUTHORIZATION_TOKEN env[AWS_CONTAINER_CREDENTIALS_FULL_URI] = $AWS_CONTAINER_CREDENTIALS_FULL_URI env[AWS_CONTAINER_CREDENTIALS_RELATIVE_URI] = $AWS_CONTAINER_CREDENTIALS_RELATIVE_URI +env[AWS_DEFAULT_REGION] = $AWS_DEFAULT_REGION env[AWS_PROFILE] = $AWS_PROFILE env[AWS_ROLE_ARN] = $AWS_ROLE_ARN env[AWS_ROLE_SESSION_NAME] = $AWS_ROLE_SESSION_NAME