Skip to content

Commit 5bad0cb

Browse files
tianontianon
committed
Add '#1000' syntax fix too
1 parent 155958d commit 5bad0cb

File tree

13 files changed

+65
-0
lines changed

13 files changed

+65
-0
lines changed

‎docker-entrypoint.sh

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,11 @@ if [[ "$1" == apache2* ]] || [ "$1" == php-fpm ]; then
2929
apache2*)
3030
user="${APACHE_RUN_USER:-www-data}"
3131
group="${APACHE_RUN_GROUP:-www-data}"
32+
33+
# strip off any '#' symbol ('#1000' is valid syntax for Apache)
34+
pound='#'
35+
user="${user#$pound}"
36+
group="${group#$pound}"
3237
;;
3338
*) # php-fpm
3439
user='www-data'

‎php5.6/apache/docker-entrypoint.sh

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,11 @@ if [[ "$1" == apache2* ]] || [ "$1" == php-fpm ]; then
2929
apache2*)
3030
user="${APACHE_RUN_USER:-www-data}"
3131
group="${APACHE_RUN_GROUP:-www-data}"
32+
33+
# strip off any '#' symbol ('#1000' is valid syntax for Apache)
34+
pound='#'
35+
user="${user#$pound}"
36+
group="${group#$pound}"
3237
;;
3338
*) # php-fpm
3439
user='www-data'

‎php5.6/fpm-alpine/docker-entrypoint.sh

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,11 @@ if [[ "$1" == apache2* ]] || [ "$1" == php-fpm ]; then
2929
apache2*)
3030
user="${APACHE_RUN_USER:-www-data}"
3131
group="${APACHE_RUN_GROUP:-www-data}"
32+
33+
# strip off any '#' symbol ('#1000' is valid syntax for Apache)
34+
pound='#'
35+
user="${user#$pound}"
36+
group="${group#$pound}"
3237
;;
3338
*) # php-fpm
3439
user='www-data'

‎php5.6/fpm/docker-entrypoint.sh

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,11 @@ if [[ "$1" == apache2* ]] || [ "$1" == php-fpm ]; then
2929
apache2*)
3030
user="${APACHE_RUN_USER:-www-data}"
3131
group="${APACHE_RUN_GROUP:-www-data}"
32+
33+
# strip off any '#' symbol ('#1000' is valid syntax for Apache)
34+
pound='#'
35+
user="${user#$pound}"
36+
group="${group#$pound}"
3237
;;
3338
*) # php-fpm
3439
user='www-data'

‎php7.0/apache/docker-entrypoint.sh

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,11 @@ if [[ "$1" == apache2* ]] || [ "$1" == php-fpm ]; then
2929
apache2*)
3030
user="${APACHE_RUN_USER:-www-data}"
3131
group="${APACHE_RUN_GROUP:-www-data}"
32+
33+
# strip off any '#' symbol ('#1000' is valid syntax for Apache)
34+
pound='#'
35+
user="${user#$pound}"
36+
group="${group#$pound}"
3237
;;
3338
*) # php-fpm
3439
user='www-data'

‎php7.0/fpm-alpine/docker-entrypoint.sh

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,11 @@ if [[ "$1" == apache2* ]] || [ "$1" == php-fpm ]; then
2929
apache2*)
3030
user="${APACHE_RUN_USER:-www-data}"
3131
group="${APACHE_RUN_GROUP:-www-data}"
32+
33+
# strip off any '#' symbol ('#1000' is valid syntax for Apache)
34+
pound='#'
35+
user="${user#$pound}"
36+
group="${group#$pound}"
3237
;;
3338
*) # php-fpm
3439
user='www-data'

‎php7.0/fpm/docker-entrypoint.sh

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,11 @@ if [[ "$1" == apache2* ]] || [ "$1" == php-fpm ]; then
2929
apache2*)
3030
user="${APACHE_RUN_USER:-www-data}"
3131
group="${APACHE_RUN_GROUP:-www-data}"
32+
33+
# strip off any '#' symbol ('#1000' is valid syntax for Apache)
34+
pound='#'
35+
user="${user#$pound}"
36+
group="${group#$pound}"
3237
;;
3338
*) # php-fpm
3439
user='www-data'

‎php7.1/apache/docker-entrypoint.sh

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,11 @@ if [[ "$1" == apache2* ]] || [ "$1" == php-fpm ]; then
2929
apache2*)
3030
user="${APACHE_RUN_USER:-www-data}"
3131
group="${APACHE_RUN_GROUP:-www-data}"
32+
33+
# strip off any '#' symbol ('#1000' is valid syntax for Apache)
34+
pound='#'
35+
user="${user#$pound}"
36+
group="${group#$pound}"
3237
;;
3338
*) # php-fpm
3439
user='www-data'

‎php7.1/fpm-alpine/docker-entrypoint.sh

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,11 @@ if [[ "$1" == apache2* ]] || [ "$1" == php-fpm ]; then
2929
apache2*)
3030
user="${APACHE_RUN_USER:-www-data}"
3131
group="${APACHE_RUN_GROUP:-www-data}"
32+
33+
# strip off any '#' symbol ('#1000' is valid syntax for Apache)
34+
pound='#'
35+
user="${user#$pound}"
36+
group="${group#$pound}"
3237
;;
3338
*) # php-fpm
3439
user='www-data'

‎php7.1/fpm/docker-entrypoint.sh

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,11 @@ if [[ "$1" == apache2* ]] || [ "$1" == php-fpm ]; then
2929
apache2*)
3030
user="${APACHE_RUN_USER:-www-data}"
3131
group="${APACHE_RUN_GROUP:-www-data}"
32+
33+
# strip off any '#' symbol ('#1000' is valid syntax for Apache)
34+
pound='#'
35+
user="${user#$pound}"
36+
group="${group#$pound}"
3237
;;
3338
*) # php-fpm
3439
user='www-data'

‎php7.2/apache/docker-entrypoint.sh

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,11 @@ if [[ "$1" == apache2* ]] || [ "$1" == php-fpm ]; then
2929
apache2*)
3030
user="${APACHE_RUN_USER:-www-data}"
3131
group="${APACHE_RUN_GROUP:-www-data}"
32+
33+
# strip off any '#' symbol ('#1000' is valid syntax for Apache)
34+
pound='#'
35+
user="${user#$pound}"
36+
group="${group#$pound}"
3237
;;
3338
*) # php-fpm
3439
user='www-data'

‎php7.2/fpm-alpine/docker-entrypoint.sh

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,11 @@ if [[ "$1" == apache2* ]] || [ "$1" == php-fpm ]; then
2929
apache2*)
3030
user="${APACHE_RUN_USER:-www-data}"
3131
group="${APACHE_RUN_GROUP:-www-data}"
32+
33+
# strip off any '#' symbol ('#1000' is valid syntax for Apache)
34+
pound='#'
35+
user="${user#$pound}"
36+
group="${group#$pound}"
3237
;;
3338
*) # php-fpm
3439
user='www-data'

‎php7.2/fpm/docker-entrypoint.sh

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,11 @@ if [[ "$1" == apache2* ]] || [ "$1" == php-fpm ]; then
2929
apache2*)
3030
user="${APACHE_RUN_USER:-www-data}"
3131
group="${APACHE_RUN_GROUP:-www-data}"
32+
33+
# strip off any '#' symbol ('#1000' is valid syntax for Apache)
34+
pound='#'
35+
user="${user#$pound}"
36+
group="${group#$pound}"
3237
;;
3338
*) # php-fpm
3439
user='www-data'

0 commit comments

Comments
 (0)