From a3109172204b594f24678c2081df3817d237d709 Mon Sep 17 00:00:00 2001 From: aptalca Date: Sat, 13 Oct 2018 11:30:51 +0000 Subject: [PATCH 1/2] Update fastcgi_params for user login support --- Dockerfile | 3 +++ Dockerfile.aarch64 | 3 +++ Dockerfile.armhf | 3 +++ README.md | 1 + readme-vars.yml | 1 + 5 files changed, 11 insertions(+) diff --git a/Dockerfile b/Dockerfile index d53d7c7..abebdda 100644 --- a/Dockerfile +++ b/Dockerfile @@ -31,6 +31,9 @@ RUN \ tar xf \ /tmp/heimdall.tar.gz -C \ /var/www/localhost/heimdall --strip-components=1 && \ + echo "**** configure nginx ****" && \ + echo -e 'fastcgi_param PHP_AUTH_USER $remote_user;\nfastcgi_param PHP_AUTH_PW $http_authorization;' >> \ + /etc/nginx/fastcgi_params && \ echo "**** cleanup ****" && \ rm -rf \ /tmp/* diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 560e7fc..01182e8 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -34,6 +34,9 @@ RUN \ tar xf \ /tmp/heimdall.tar.gz -C \ /var/www/localhost/heimdall --strip-components=1 && \ + echo "**** configure nginx ****" && \ + echo -e 'fastcgi_param PHP_AUTH_USER $remote_user;\nfastcgi_param PHP_AUTH_PW $http_authorization;' >> \ + /etc/nginx/fastcgi_params && \ echo "**** cleanup ****" && \ rm -rf \ /tmp/* diff --git a/Dockerfile.armhf b/Dockerfile.armhf index 306eda2..af81cbe 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -34,6 +34,9 @@ RUN \ tar xf \ /tmp/heimdall.tar.gz -C \ /var/www/localhost/heimdall --strip-components=1 && \ + echo "**** configure nginx ****" && \ + echo -e 'fastcgi_param PHP_AUTH_USER $remote_user;\nfastcgi_param PHP_AUTH_PW $http_authorization;' >> \ + /etc/nginx/fastcgi_params && \ echo "**** cleanup ****" && \ rm -rf \ /tmp/* diff --git a/README.md b/README.md index 201351e..eaada12 100644 --- a/README.md +++ b/README.md @@ -136,6 +136,7 @@ This image now supports password protection through htpasswd. Run the following ## Versions +* **16.10.18:** - Updated fastcgi_params for user login support * **07.10.18:** - Symlink `.env` rather than copy. It now resides under `/config/www` * **30.09.18:** - Multi-arch image. Move `.env` to `/config`. * **05.09.18:** - Rebase to alpine linux 3.8. diff --git a/readme-vars.yml b/readme-vars.yml index 417ba9a..5fc83c0 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -47,6 +47,7 @@ app_setup_block: | # changelog changelogs: + - { date: "16.10.18:", desc: "Updated fastcgi_params for user login support" } - { date: "07.10.18:", desc: "Symlink `.env` rather than copy. It now resides under `/config/www`" } - { date: "30.09.18:", desc: "Multi-arch image. Move `.env` to `/config`." } - { date: "05.09.18:", desc: "Rebase to alpine linux 3.8." } From 8a288bbef92c559395c393704263e036e8e00492 Mon Sep 17 00:00:00 2001 From: aptalca Date: Sat, 13 Oct 2018 11:51:51 +0000 Subject: [PATCH 2/2] add comment --- Dockerfile | 2 +- Dockerfile.aarch64 | 2 +- Dockerfile.armhf | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index abebdda..5fa6bf3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -32,7 +32,7 @@ RUN \ /tmp/heimdall.tar.gz -C \ /var/www/localhost/heimdall --strip-components=1 && \ echo "**** configure nginx ****" && \ - echo -e 'fastcgi_param PHP_AUTH_USER $remote_user;\nfastcgi_param PHP_AUTH_PW $http_authorization;' >> \ + echo -e '\n# Heimdall user authorization\nfastcgi_param PHP_AUTH_USER $remote_user;\nfastcgi_param PHP_AUTH_PW $http_authorization;' >> \ /etc/nginx/fastcgi_params && \ echo "**** cleanup ****" && \ rm -rf \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 01182e8..6b0e767 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -35,7 +35,7 @@ RUN \ /tmp/heimdall.tar.gz -C \ /var/www/localhost/heimdall --strip-components=1 && \ echo "**** configure nginx ****" && \ - echo -e 'fastcgi_param PHP_AUTH_USER $remote_user;\nfastcgi_param PHP_AUTH_PW $http_authorization;' >> \ + echo -e '\n# Heimdall user authorization\nfastcgi_param PHP_AUTH_USER $remote_user;\nfastcgi_param PHP_AUTH_PW $http_authorization;' >> \ /etc/nginx/fastcgi_params && \ echo "**** cleanup ****" && \ rm -rf \ diff --git a/Dockerfile.armhf b/Dockerfile.armhf index af81cbe..108c3f4 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -35,7 +35,7 @@ RUN \ /tmp/heimdall.tar.gz -C \ /var/www/localhost/heimdall --strip-components=1 && \ echo "**** configure nginx ****" && \ - echo -e 'fastcgi_param PHP_AUTH_USER $remote_user;\nfastcgi_param PHP_AUTH_PW $http_authorization;' >> \ + echo -e '\n# Heimdall user authorization\nfastcgi_param PHP_AUTH_USER $remote_user;\nfastcgi_param PHP_AUTH_PW $http_authorization;' >> \ /etc/nginx/fastcgi_params && \ echo "**** cleanup ****" && \ rm -rf \