Commit 40612563 authored by Bertrand Gauthier's avatar Bertrand Gauthier
Browse files

Dockerfile.sh : rétablissement des [[ et lancement explicite du script... 

Dockerfile.sh : rétablissement des [[ et lancement explicite du script /sbin/entrypoint.sh avec bash.
parent 331bd6e8

Dockerfile.sh

+1 −1
Changes for Dockerfile.sh: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -132,4 +132,4 @@ cp entrypoint.d/* /entrypoint.d/ 
cp entrypoint.sh /sbin/entrypoint.sh

chmod 755 /sbin/entrypoint.sh

export WITHOUT_DOCKER=1

. /sbin/entrypoint.sh
 
bash /sbin/entrypoint.sh

entrypoint.sh

+2 −2
Changes for entrypoint.sh: 2 added lines, 2 removed lines.
Original line number Diff line number Diff line 
#!/usr/bin/env bash



if [ -z ${PHP_VERSION} ]; then \

if [[ -z ${PHP_VERSION} ]]; then \

    echo "Variable PHP_VERSION non définie, impossible de continuer."

    exit 1

fi
@@ -16,7 +16,7 @@ fi 
mkdir -p /var/run/apache2

. /etc/apache2/envvars

startApache() {

  if [ -z ${WITHOUT_DOCKER} ]; then

  if [[ -z ${WITHOUT_DOCKER} ]]; then

    /usr/sbin/apache2ctl -D FOREGROUND

  else

    /usr/sbin/apache2ctl start