From e6ad86ef7db0df7755bd25f75be053f76a8970d2 Mon Sep 17 00:00:00 2001 From: selim13 Date: Mon, 17 Jul 2017 12:32:57 +0300 Subject: [PATCH] Pin Alpine version and fix the lack of symlink to php5 executable --- 3.1-apache/Dockerfile | 4 +++- 3.2-apache/Dockerfile | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/3.1-apache/Dockerfile b/3.1-apache/Dockerfile index 0af50e9..e5f72fc 100644 --- a/3.1-apache/Dockerfile +++ b/3.1-apache/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:latest +FROM alpine:3.6 MAINTAINER Dmitry Seleznyov @@ -48,6 +48,8 @@ COPY apache2/conf.d/* /etc/apache2/conf.d/ COPY php5/php.ini /etc/php5/ COPY php5/php-cli.ini /etc/php5/ COPY php5/conf.d/* /etc/php5/conf.d/ +# Alpine 3.6 doesn't create this symlink for PHP5 in favour of PHP7 +RUN ln -s /usr/bin/php5 /usr/bin/php COPY start.sh /usr/local/bin/ diff --git a/3.2-apache/Dockerfile b/3.2-apache/Dockerfile index 5adf769..0ac275d 100644 --- a/3.2-apache/Dockerfile +++ b/3.2-apache/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:latest +FROM alpine:3.6 MAINTAINER Dmitry Seleznyov @@ -49,6 +49,8 @@ COPY apache2/conf.d/* /etc/apache2/conf.d/ COPY php5/php.ini /etc/php5/ COPY php5/php-cli.ini /etc/php5/ COPY php5/conf.d/* /etc/php5/conf.d/ +# Alpine 3.6 doesn't create this symlink for PHP5 in favour of PHP7 +RUN ln -s /usr/bin/php5 /usr/bin/php COPY start.sh /usr/local/bin/