update lychee && privatebin to php7.1

This commit is contained in:
Wonderfall
2017-02-26 03:07:30 +01:00
parent 814c4bb679
commit 3fbd11fdf0
6 changed files with 30 additions and 32 deletions

View File

@ -2,18 +2,18 @@ FROM alpine:edge
ENV GID=991 UID=991
RUN echo "@commuedge https://nl.alpinelinux.org/alpine/edge/community" >> /etc/apk/repositories \
RUN echo "@testing https://nl.alpinelinux.org/alpine/edge/testing" >> /etc/apk/repositories \
&& BUILD_DEPS="tar libressl ca-certificates" \
&& apk -U add \
&& apk -U upgrade && apk add \
$BUILD_DEPS \
nginx \
s6 \
su-exec \
php7-fpm@commuedge \
php7-gd@commuedge \
php7-mcrypt@commuedge \
php7-json@commuedge \
php7-zlib@commuedge \
php7.1-fpm@testing \
php7.1-gd@testing \
php7.1-mcrypt@testing \
php7.1-json@testing \
php7.1-zlib@testing \
&& mkdir zerobin && cd zerobin \
&& wget -qO- https://github.com/PrivateBin/PrivateBin/archive/master.tar.gz | tar xz --strip 1 \
&& mv cfg/conf.ini.sample cfg/conf.ini \
@ -21,7 +21,7 @@ RUN echo "@commuedge https://nl.alpinelinux.org/alpine/edge/community" >> /etc/a
&& rm -f /var/cache/apk/*
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 run.sh /usr/local/bin/run.sh
COPY s6.d /etc/s6.d

View File

@ -1,3 +1,3 @@
#!/bin/sh
chown -R $UID:$GID /zerobin /etc/nginx /etc/php7 /var/log /var/lib/nginx /tmp /etc/s6.d
chown -R $UID:$GID /zerobin /etc/nginx /etc/php7.1 /var/log /var/lib/nginx /tmp /etc/s6.d
exec su-exec $UID:$GID /bin/s6-svscan /etc/s6.d

View File

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