Merge pull request #34 from linuxserver/alpine_3.6

bump to alpine 3.6
This commit is contained in:
j0nnymoe 2017-05-25 22:37:43 +01:00 committed by GitHub
commit bbf956e95a
2 changed files with 8 additions and 18 deletions

View File

@ -1,4 +1,4 @@
FROM lsiobase/alpine.nginx:3.5
FROM lsiobase/alpine.nginx:3.6
MAINTAINER sparklyballs
# set version label
@ -21,31 +21,16 @@ RUN \
g++ \
gcc \
make \
php7-dev \
re2c \
samba-dev \
zlib-dev && \
apk add --no-cache --virtual=build-dependencies \
--repository http://nl.alpinelinux.org/alpine/edge/community \
php7-dev && \
# install runtime packages
apk add --no-cache \
curl \
ffmpeg \
libxml2 \
samba \
sudo \
tar \
unzip && \
apk add --no-cache \
--repository http://nl.alpinelinux.org/alpine/edge/main \
icu-libs \
libwebp && \
apk add --no-cache \
--repository http://nl.alpinelinux.org/alpine/edge/community \
php7-apcu \
php7-bz2 \
php7-ctype \
@ -72,7 +57,11 @@ RUN \
php7-sqlite3 \
php7-xml \
php7-xmlreader \
php7-zip && \
php7-zip \
samba \
sudo \
tar \
unzip && \
# fetch php smbclient source
git clone git://github.com/eduardok/libsmbclient-php.git /tmp/smbclient && \

View File

@ -81,6 +81,7 @@ If updating to nextcloud 12 you will need to comment out line `add_header X-Fram
## Versions
+ **25.05.17:** Rebase to alpine 3.6.
+ **22.05.17:** Update to nextcloud 12.0, adding required dependecies and note about commenting out SAMEORIGIN; line.
+ **03.05.17:** Use community repo of memcached.
+ **07.03.17:** Release into main repository and upgrade to php7 and Alpine 3.5.