Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix php apache variants regression (AllowOverride) #1933

Merged
merged 1 commit into from
Jul 8, 2016
Rate limit · GitHub

Access has been restricted

You have triggered a rate limit.

Please wait a few minutes before you try again;
in some cases this may take up to an hour.

Conversation

tianon
Copy link
Member

@tianon tianon commented Jul 8, 2016

See docker-library/php#254 for more details.

@tianon
Copy link
Member Author

tianon commented Jul 8, 2016

Build test of #1933; 43d4c7e (php):

$ bashbrew build php:7.0.8-cli
Using bashbrew/cache:972bebe76f57c7ad1d184d45b7f6f9d851caef9d817e8e0b4ebccc27948416e0 (php:7.0.8-cli)
Tagging php:7.0.8-cli
Tagging php:7.0-cli
Tagging php:7-cli
Tagging php:cli
Tagging php:7.0.8
Tagging php:7.0
Tagging php:7
Tagging php:latest

$ test/run.sh php:7.0.8-cli
testing php:7.0.8-cli
    'utc' [1/6]...passed
    'cve-2014--shellshock' [2/6]...passed
    'no-hard-coded-passwords' [3/6]...passed
    'override-cmd' [4/6]...passed
    'php-ext-install' [5/6]...passed
    'php-hello-world' [6/6]...passed


$ bashbrew build php:7.0.8-alpine
Using bashbrew/cache:db32bef5546643d5607f577cf056960a53ddbfc72013ab81b11e45a5324ae11a (php:7.0.8-alpine)
Tagging php:7.0.8-alpine
Tagging php:7.0-alpine
Tagging php:7-alpine
Tagging php:alpine

$ test/run.sh php:7.0.8-alpine
testing php:7.0.8-alpine
    'utc' [1/6]...passed
    'cve-2014--shellshock' [2/6]...passed
    'no-hard-coded-passwords' [3/6]...passed
    'override-cmd' [4/6]...passed
    'php-ext-install' [5/6]...passed
    'php-hello-world' [6/6]...passed


$ bashbrew build php:7.0.8-apache
Building bashbrew/cache:d6c3d4f9d6d9c8ab4216b7717a9189ac0535a519652747517e01d8d26e6bc848 (php:7.0.8-apache)
Tagging php:7.0.8-apache
Tagging php:7.0-apache
Tagging php:7-apache
Tagging php:apache

$ test/run.sh php:7.0.8-apache
testing php:7.0.8-apache
    'utc' [1/7]...passed
    'cve-2014--shellshock' [2/7]...passed
    'no-hard-coded-passwords' [3/7]...passed
    'override-cmd' [4/7]...passed
    'php-ext-install' [5/7]...passed
    'php-hello-world' [6/7]...passed
    'php-apache-hello-web' [7/7]...passed


$ bashbrew build php:7.0.8-fpm
Using bashbrew/cache:44e606cd57ad415cc46343a99cd35aa7bc7abb3252605d56d3df13ff3d351760 (php:7.0.8-fpm)
Tagging php:7.0.8-fpm
Tagging php:7.0-fpm
Tagging php:7-fpm
Tagging php:fpm

$ test/run.sh php:7.0.8-fpm
testing php:7.0.8-fpm
    'utc' [1/7]...passed
    'cve-2014--shellshock' [2/7]...passed
    'no-hard-coded-passwords' [3/7]...passed
    'override-cmd' [4/7]...passed
    'php-ext-install' [5/7]...passed
    'php-hello-world' [6/7]...passed
    'php-fpm-hello-web' [7/7]...passed


$ bashbrew build php:7.0.8-fpm-alpine
Using bashbrew/cache:536d6921d69f049f80a3ad2135605db721a849606345634aac1ed9f0093e7718 (php:7.0.8-fpm-alpine)
Tagging php:7.0.8-fpm-alpine
Tagging php:7.0-fpm-alpine
Tagging php:7-fpm-alpine
Tagging php:fpm-alpine

$ test/run.sh php:7.0.8-fpm-alpine
testing php:7.0.8-fpm-alpine
    'utc' [1/6]...passed
    'cve-2014--shellshock' [2/6]...passed
    'no-hard-coded-passwords' [3/6]...passed
    'override-cmd' [4/6]...passed
    'php-ext-install' [5/6]...passed
    'php-hello-world' [6/6]...passed


$ bashbrew build php:7.0.8-zts
Using bashbrew/cache:9b88ca22d9b5468f66486c51edfa7d8e8109dfdc42409e311c6173ba387465e0 (php:7.0.8-zts)
Tagging php:7.0.8-zts
Tagging php:7.0-zts
Tagging php:7-zts
Tagging php:zts

$ test/run.sh php:7.0.8-zts
testing php:7.0.8-zts
    'utc' [1/6]...passed
    'cve-2014--shellshock' [2/6]...passed
    'no-hard-coded-passwords' [3/6]...passed
    'override-cmd' [4/6]...passed
    'php-ext-install' [5/6]...passed
    'php-hello-world' [6/6]...passed


$ bashbrew build php:7.0.8-zts-alpine
Using bashbrew/cache:01be5cea83001a3ccecb5769258ed496358e14132d02473779f2fbfd39fb403a (php:7.0.8-zts-alpine)
Tagging php:7.0.8-zts-alpine
Tagging php:7.0-zts-alpine
Tagging php:7-zts-alpine
Tagging php:zts-alpine

$ test/run.sh php:7.0.8-zts-alpine
testing php:7.0.8-zts-alpine
    'utc' [1/6]...passed
    'cve-2014--shellshock' [2/6]...passed
    'no-hard-coded-passwords' [3/6]...passed
    'override-cmd' [4/6]...passed
    'php-ext-install' [5/6]...passed
    'php-hello-world' [6/6]...passed


$ bashbrew build php:5.6.23-cli
Using bashbrew/cache:10645d37423296e80c9202c54d5cf64d7972c99022b01359487ec89653f2c3cb (php:5.6.23-cli)
Tagging php:5.6.23-cli
Tagging php:5.6-cli
Tagging php:5-cli
Tagging php:5.6.23
Tagging php:5.6
Tagging php:5

$ test/run.sh php:5.6.23-cli
testing php:5.6.23-cli
    'utc' [1/6]...passed
    'cve-2014--shellshock' [2/6]...passed
    'no-hard-coded-passwords' [3/6]...passed
    'override-cmd' [4/6]...passed
    'php-ext-install' [5/6]...passed
    'php-hello-world' [6/6]...passed


$ bashbrew build php:5.6.23-alpine
Using bashbrew/cache:7b9c14943c79f873ff93c4192e0d23eda0cf258758b77e208091dda2c688d487 (php:5.6.23-alpine)
Tagging php:5.6.23-alpine
Tagging php:5.6-alpine
Tagging php:5-alpine

$ test/run.sh php:5.6.23-alpine
testing php:5.6.23-alpine
    'utc' [1/6]...passed
    'cve-2014--shellshock' [2/6]...passed
    'no-hard-coded-passwords' [3/6]...passed
    'override-cmd' [4/6]...passed
    'php-ext-install' [5/6]...passed
    'php-hello-world' [6/6]...passed


$ bashbrew build php:5.6.23-apache
Building bashbrew/cache:b8af5c334b20ef1d0591f46ca8a148324e4e2838f45ccbb10be3b431ab1ec92c (php:5.6.23-apache)
Tagging php:5.6.23-apache
Tagging php:5.6-apache
Tagging php:5-apache

$ test/run.sh php:5.6.23-apache
testing php:5.6.23-apache
    'utc' [1/7]...passed
    'cve-2014--shellshock' [2/7]...passed
    'no-hard-coded-passwords' [3/7]...passed
    'override-cmd' [4/7]...passed
    'php-ext-install' [5/7]...passed
    'php-hello-world' [6/7]...passed
    'php-apache-hello-web' [7/7]...passed


$ bashbrew build php:5.6.23-fpm
Using bashbrew/cache:2e62d93dff57f5ffff618bc6a923e4c5cd9de21185ad941d7faf3ea0762c4f62 (php:5.6.23-fpm)
Tagging php:5.6.23-fpm
Tagging php:5.6-fpm
Tagging php:5-fpm

$ test/run.sh php:5.6.23-fpm
testing php:5.6.23-fpm
    'utc' [1/7]...passed
    'cve-2014--shellshock' [2/7]...passed
    'no-hard-coded-passwords' [3/7]...passed
    'override-cmd' [4/7]...passed
    'php-ext-install' [5/7]...passed
    'php-hello-world' [6/7]...passed
    'php-fpm-hello-web' [7/7]...passed


$ bashbrew build php:5.6.23-fpm-alpine
Using bashbrew/cache:7631852677bf11009d8eae106cfaee2166202e407ab7c773e11cad309dc82ec4 (php:5.6.23-fpm-alpine)
Tagging php:5.6.23-fpm-alpine
Tagging php:5.6-fpm-alpine
Tagging php:5-fpm-alpine

$ test/run.sh php:5.6.23-fpm-alpine
testing php:5.6.23-fpm-alpine
    'utc' [1/6]...passed
    'cve-2014--shellshock' [2/6]...passed
    'no-hard-coded-passwords' [3/6]...passed
    'override-cmd' [4/6]...passed
    'php-ext-install' [5/6]...passed
    'php-hello-world' [6/6]...passed


$ bashbrew build php:5.6.23-zts
Using bashbrew/cache:173baffe458996c94439e6580154169b115202aa14cb5fb7fbcfc486d6ba2dfd (php:5.6.23-zts)
Tagging php:5.6.23-zts
Tagging php:5.6-zts
Tagging php:5-zts

$ test/run.sh php:5.6.23-zts
testing php:5.6.23-zts
    'utc' [1/6]...passed
    'cve-2014--shellshock' [2/6]...passed
    'no-hard-coded-passwords' [3/6]...passed
    'override-cmd' [4/6]...passed
    'php-ext-install' [5/6]...passed
    'php-hello-world' [6/6]...passed


$ bashbrew build php:5.6.23-zts-alpine
Using bashbrew/cache:a258cc7bee2e09f33053bbfd24359742c4853cdcc75acdaa030161bbe5a7b5cf (php:5.6.23-zts-alpine)
Tagging php:5.6.23-zts-alpine
Tagging php:5.6-zts-alpine
Tagging php:5-zts-alpine

$ test/run.sh php:5.6.23-zts-alpine
testing php:5.6.23-zts-alpine
    'utc' [1/6]...passed
    'cve-2014--shellshock' [2/6]...passed
    'no-hard-coded-passwords' [3/6]...passed
    'override-cmd' [4/6]...passed
    'php-ext-install' [5/6]...passed
    'php-hello-world' [6/6]...passed


$ bashbrew build php:5.5.37-cli
Using bashbrew/cache:68ae1697937d642402238b85e9c8e38b370f2d64082d255b2f8e9d882abfead7 (php:5.5.37-cli)
Tagging php:5.5.37-cli
Tagging php:5.5-cli
Tagging php:5.5.37
Tagging php:5.5

$ test/run.sh php:5.5.37-cli
testing php:5.5.37-cli
    'utc' [1/6]...passed
    'cve-2014--shellshock' [2/6]...passed
    'no-hard-coded-passwords' [3/6]...passed
    'override-cmd' [4/6]...passed
    'php-ext-install' [5/6]...passed
    'php-hello-world' [6/6]...passed


$ bashbrew build php:5.5.37-alpine
Using bashbrew/cache:6fc4028028105f5aaec22fc7aafc29ecfba2d46828157bfb90ff9439f68724be (php:5.5.37-alpine)
Tagging php:5.5.37-alpine
Tagging php:5.5-alpine

$ test/run.sh php:5.5.37-alpine
testing php:5.5.37-alpine
    'utc' [1/6]...passed
    'cve-2014--shellshock' [2/6]...passed
    'no-hard-coded-passwords' [3/6]...passed
    'override-cmd' [4/6]...passed
    'php-ext-install' [5/6]...passed
    'php-hello-world' [6/6]...passed


$ bashbrew build php:5.5.37-apache
Building bashbrew/cache:4bbdbd4c8af85588bcd0afda1fa43329f494a5c5e88e9b9bb8c6ef4b9c9e42fa (php:5.5.37-apache)
Tagging php:5.5.37-apache
Tagging php:5.5-apache

$ test/run.sh php:5.5.37-apache
testing php:5.5.37-apache
    'utc' [1/7]...passed
    'cve-2014--shellshock' [2/7]...passed
    'no-hard-coded-passwords' [3/7]...passed
    'override-cmd' [4/7]...passed
    'php-ext-install' [5/7]...passed
    'php-hello-world' [6/7]...passed
    'php-apache-hello-web' [7/7]...passed


$ bashbrew build php:5.5.37-fpm
Using bashbrew/cache:bce0d59fe4eb4cebe31ba1fb446d501e71440dddaef0dac6459214307cdc8c65 (php:5.5.37-fpm)
Tagging php:5.5.37-fpm
Tagging php:5.5-fpm

$ test/run.sh php:5.5.37-fpm
testing php:5.5.37-fpm
    'utc' [1/7]...passed
    'cve-2014--shellshock' [2/7]...passed
    'no-hard-coded-passwords' [3/7]...passed
    'override-cmd' [4/7]...passed
    'php-ext-install' [5/7]...passed
    'php-hello-world' [6/7]...passed
    'php-fpm-hello-web' [7/7]...passed


$ bashbrew build php:5.5.37-fpm-alpine
Using bashbrew/cache:775675f2ec5878da8c3a5821febb137492dcc62619ec043b214922885480e46e (php:5.5.37-fpm-alpine)
Tagging php:5.5.37-fpm-alpine
Tagging php:5.5-fpm-alpine

$ test/run.sh php:5.5.37-fpm-alpine
testing php:5.5.37-fpm-alpine
    'utc' [1/6]...passed
    'cve-2014--shellshock' [2/6]...passed
    'no-hard-coded-passwords' [3/6]...passed
    'override-cmd' [4/6]...passed
    'php-ext-install' [5/6]...passed
    'php-hello-world' [6/6]...passed


$ bashbrew build php:5.5.37-zts
Using bashbrew/cache:cd88c47524f2c7c9d64dda9adde9e6b8a0765f64b9536dae5756c6699544112b (php:5.5.37-zts)
Tagging php:5.5.37-zts
Tagging php:5.5-zts

$ test/run.sh php:5.5.37-zts
testing php:5.5.37-zts
    'utc' [1/6]...passed
    'cve-2014--shellshock' [2/6]...passed
    'no-hard-coded-passwords' [3/6]...passed
    'override-cmd' [4/6]...passed
    'php-ext-install' [5/6]...passed
    'php-hello-world' [6/6]...passed


$ bashbrew build php:5.5.37-zts-alpine
Using bashbrew/cache:233a7a7f40690eadad3fb9ea3f98793aa2dda99cf9b8b8607819c8180addaec0 (php:5.5.37-zts-alpine)
Tagging php:5.5.37-zts-alpine
Tagging php:5.5-zts-alpine

$ test/run.sh php:5.5.37-zts-alpine
testing php:5.5.37-zts-alpine
    'utc' [1/6]...passed
    'cve-2014--shellshock' [2/6]...passed
    'no-hard-coded-passwords' [3/6]...passed
    'override-cmd' [4/6]...passed
    'php-ext-install' [5/6]...passed
    'php-hello-world' [6/6]...passed

@tianon
Copy link
Member Author

tianon commented Jul 8, 2016

diff --git a/php_5-apache/Dockerfile b/php_5-apache/Dockerfile
index 440868e..7260d28 100644
--- a/php_5-apache/Dockerfile
+++ b/php_5-apache/Dockerfile
@@ -60,6 +60,11 @@ RUN { \
        echo; \
        echo 'DirectoryIndex disabled'; \
        echo 'DirectoryIndex index.php index.html'; \
+       echo; \
+       echo '<Directory /var/www/>'; \
+       echo '\tOptions -Indexes'; \
+       echo '\tAllowOverride All'; \
+       echo '</Directory>'; \
    } | tee "$APACHE_CONFDIR/conf-available/docker-php.conf" \
    && a2enconf docker-php

diff --git a/php_5.5-apache/Dockerfile b/php_5.5-apache/Dockerfile
index fa055bc..3543f47 100644
--- a/php_5.5-apache/Dockerfile
+++ b/php_5.5-apache/Dockerfile
@@ -60,6 +60,11 @@ RUN { \
        echo; \
        echo 'DirectoryIndex disabled'; \
        echo 'DirectoryIndex index.php index.html'; \
+       echo; \
+       echo '<Directory /var/www/>'; \
+       echo '\tOptions -Indexes'; \
+       echo '\tAllowOverride All'; \
+       echo '</Directory>'; \
    } | tee "$APACHE_CONFDIR/conf-available/docker-php.conf" \
    && a2enconf docker-php

diff --git a/php_apache/Dockerfile b/php_apache/Dockerfile
index f1ebb5b..b927781 100644
--- a/php_apache/Dockerfile
+++ b/php_apache/Dockerfile
@@ -60,6 +60,11 @@ RUN { \
        echo; \
        echo 'DirectoryIndex disabled'; \
        echo 'DirectoryIndex index.php index.html'; \
+       echo; \
+       echo '<Directory /var/www/>'; \
+       echo '\tOptions -Indexes'; \
+       echo '\tAllowOverride All'; \
+       echo '</Directory>'; \
    } | tee "$APACHE_CONFDIR/conf-available/docker-php.conf" \
    && a2enconf docker-php

@yosifkit
Copy link
Member

yosifkit commented Jul 8, 2016

LGTM

@yosifkit yosifkit merged commit d1bd2f7 into docker-library:master Jul 8, 2016
@yosifkit yosifkit deleted the fix-php-apache branch July 8, 2016 22:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Rate limit · GitHub

Access has been restricted

You have triggered a rate limit.

Please wait a few minutes before you try again;
in some cases this may take up to an hour.

3 participants