hdkv/docker-phpbb
1
Fork 0
Code Issues Pull Requests Packages Activity

Pin Alpine version and fix the lack of symlink to php5 executable

Browse Source
This commit is contained in:
selim13
2017-07-17 12:32:57 +03:00
parent a269a0bf5f
commit e6ad86ef7d
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
3.1-apache/Dockerfile
View File

@@ -1,4 +1,4 @@
FROM alpine:latest FROM alpine:3.6
MAINTAINER Dmitry Seleznyov <selim013@gmail.com> MAINTAINER Dmitry Seleznyov <selim013@gmail.com>
@@ -48,6 +48,8 @@ COPY apache2/conf.d/* /etc/apache2/conf.d/
COPY php5/php.ini /etc/php5/ COPY php5/php.ini /etc/php5/
COPY php5/php-cli.ini /etc/php5/ COPY php5/php-cli.ini /etc/php5/
COPY php5/conf.d/* /etc/php5/conf.d/ 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/ COPY start.sh /usr/local/bin/

4
3.2-apache/Dockerfile
View File

@@ -1,4 +1,4 @@
FROM alpine:latest FROM alpine:3.6
MAINTAINER Dmitry Seleznyov <selim013@gmail.com> MAINTAINER Dmitry Seleznyov <selim013@gmail.com>
@@ -49,6 +49,8 @@ COPY apache2/conf.d/* /etc/apache2/conf.d/
COPY php5/php.ini /etc/php5/ COPY php5/php.ini /etc/php5/
COPY php5/php-cli.ini /etc/php5/ COPY php5/php-cli.ini /etc/php5/
COPY php5/conf.d/* /etc/php5/conf.d/ 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/ COPY start.sh /usr/local/bin/