Merge branch 'master' of github.com:PrivateBin/docker-nginx-fpm-alpine

PrivateBin · Jul 6, 2021 · 8fe3ab9 · 8fe3ab9
2 parents 827f2c3 + 7e1fc11
commit 8fe3ab9
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/etc/php8/php-fpm.d/zz-docker.conf b/etc/php8/php-fpm.d/zz-docker.conf
@@ -11,3 +11,9 @@ pm.max_children = 5
 pm.start_servers = 2
 pm.min_spare_servers = 1
 pm.max_spare_servers = 3
+
+env[PRIVATEBIN_GCS_BUCKET] = $PRIVATEBIN_GCS_BUCKET
+env[GOOGLE_APPLICATION_CREDENTIALS] = $GOOGLE_APPLICATION_CREDENTIALS
+env[GOOGLE_CLOUD_PROJECT] = $GOOGLE_CLOUD_PROJECT
+env[GCLOUD_PROJECT] = $GCLOUD_PROJECT
+env[CONFIG_PATH] = $CONFIG_PATH
diff --git a/etc/s6/services/php-fpm8/run b/etc/s6/services/php-fpm8/run
@@ -1,2 +1,3 @@
 #!/usr/bin/execlineb -P
+with-contenv
 /usr/sbin/php-fpm8