diff --git a/7/Dockerfile.alpine-apache b/7/Dockerfile.alpine-apache index 7a60849..e2710c6 100644 --- a/7/Dockerfile.alpine-apache +++ b/7/Dockerfile.alpine-apache @@ -12,10 +12,13 @@ ARG WITH_DATABASE=false ENV WITH_APACHE=${WITH_APACHE} ENV WITH_DATABASE=${WITH_DATABASE} +ADD ./scripts/apache-entrypoint.sh /usr/local/bin/entrypoint.sh ; + # Create directory, and install required php app RUN /bin/sh /tmp/setup.sh; \ /bin/rm -f /tmp/*.sh; \ - rm -vrf /var/cache/apk/* + rm -vrf /var/cache/apk/*; \ + chmod +rx /usr/local/bin/entrypoint.sh ; FROM scratch diff --git a/7/Dockerfile.alpine-builder b/7/Dockerfile.alpine-builder index 9479e20..4518842 100644 --- a/7/Dockerfile.alpine-builder +++ b/7/Dockerfile.alpine-builder @@ -30,7 +30,7 @@ RUN /bin/mkdir -p /app ; \ php${PHP_VER_SHORT}-cli php${PHP_VER_SHORT}-phar \ php${PHP_VER_SHORT}-iconv php${PHP_VER_SHORT}-mbstring \ php${PHP_VER_SHORT}-json ; \ - /bin/chmod +x /tmp/setup.sh /usr/local/bin/composer ; + /bin/chmod +rx /tmp/setup.sh /usr/local/bin/composer ; # Create symlinks to /usr/bin/php in case it doesn't exists RUN ln -ns /usr/bin/php${PHP_VER_SHORT} /usr/bin/php ; exit 0