chore(): update to php 7.1

pull/14/head
Hardware 2017-03-12 20:40:40 +01:00
parent d61a0ccd91
commit 4d2665ecd0
No known key found for this signature in database
GPG Key ID: EC6DF6F90263EDEA
3 changed files with 20 additions and 19 deletions

View File

@ -1,4 +1,4 @@
FROM alpine:3.5 FROM alpine:edge
LABEL description "Next-generation forum software that makes online discussion fun" \ LABEL description "Next-generation forum software that makes online discussion fun" \
maintainer="Hardware <hardware@mondedie.fr>, Magicalex <magicalex@mondedie.fr>" maintainer="Hardware <hardware@mondedie.fr>, Magicalex <magicalex@mondedie.fr>"
@ -7,26 +7,27 @@ ARG VERSION=v0.1.0-beta.6
ENV GID=991 UID=991 ENV GID=991 UID=991
RUN echo "@community https://nl.alpinelinux.org/alpine/v3.5/community" >> /etc/apk/repositories \ RUN echo "@testing https://nl.alpinelinux.org/alpine/edge/testing" >> /etc/apk/repositories \
&& apk -U add \ && apk -U add \
nginx \ nginx \
s6 \ s6 \
su-exec \ su-exec \
curl \ curl \
php7-phar@community \ php7.1@testing \
php7-fpm@community \ php7.1-fileinfo@testing \
php7-curl@community \ php7.1-phar@testing \
php7-mbstring@community \ php7.1-fpm@testing \
php7-openssl@community \ php7.1-curl@testing \
php7-json@community \ php7.1-mbstring@testing \
php7-pdo_mysql@community \ php7.1-openssl@testing \
php7-gd@community \ php7.1-json@testing \
php7-dom@community \ php7.1-pdo_mysql@testing \
php7-ctype@community \ php7.1-gd@testing \
php7-session@community \ php7.1-dom@testing \
php7-opcache@community \ php7.1-ctype@testing \
php7.1-session@testing \
php7.1-opcache@testing \
&& cd /tmp \ && cd /tmp \
&& ln -s /usr/bin/php7 /usr/bin/php \
&& curl -s http://getcomposer.org/installer | php \ && curl -s http://getcomposer.org/installer | php \
&& mv /tmp/composer.phar /usr/bin/composer \ && mv /tmp/composer.phar /usr/bin/composer \
&& chmod +x /usr/bin/composer \ && chmod +x /usr/bin/composer \
@ -42,8 +43,8 @@ RUN echo "@community https://nl.alpinelinux.org/alpine/v3.5/community" >> /etc/a
&& rm -rf /flarum/.composer /var/cache/apk/* && rm -rf /flarum/.composer /var/cache/apk/*
COPY nginx.conf /etc/nginx/nginx.conf COPY nginx.conf /etc/nginx/nginx.conf
COPY php-fpm.conf /etc/php7/php-fpm.conf COPY php-fpm.conf /etc/php7.1/php-fpm.conf
COPY opcache.ini /etc/php7/conf.d/00_opcache.ini COPY opcache.ini /etc/php7.1/conf.d/00_opcache.ini
COPY config.php /flarum/app/config.php COPY config.php /flarum/app/config.php
COPY extension /usr/local/bin/extension COPY extension /usr/local/bin/extension
COPY s6.d /etc/s6.d COPY s6.d /etc/s6.d

2
run.sh
View File

@ -24,7 +24,7 @@ if [ -z "$FORUM_URL" ]; then
fi fi
# Set permissions # Set permissions
chown -R $UID:$GID /flarum /etc/nginx /etc/php7 /var/log /var/lib/nginx /tmp /etc/s6.d chown -R $UID:$GID /flarum /etc/nginx /etc/php7.1 /var/log /var/lib/nginx /tmp /etc/s6.d
cd /flarum/app cd /flarum/app

View File

@ -1,2 +1,2 @@
#!/bin/sh #!/bin/sh
exec php-fpm7 exec php-fpm7.1