Merge pull request #21 from linuxserver/3.7

Rebase to 3.7
This commit is contained in:
sparklyballs 2018-01-05 18:16:46 +00:00 committed by GitHub
commit e75ea1dc52
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 2 deletions

View File

@ -1,10 +1,10 @@
FROM lsiobase/alpine.nginx:3.6
MAINTAINER Stian Larsen, sparklyballs, aptalca
FROM lsiobase/alpine.nginx:3.7
# set version label
ARG BUILD_DATE
ARG VERSION
LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
LABEL maintainer="Stian Larsen,sparklyballs,aptalca"
# environment settings
ENV S6_BEHAVIOUR_IF_STAGE2_FAILS=2

View File

@ -81,6 +81,7 @@ Add your web files to /config/www for hosting.
## Versions
+ **05.01.18:** Rebase to alpine 3.7
+ **08.11.17:** Add php7 soap module
+ **31.10.17:** Add php7 exif and xmlreader modules
+ **30.09.17:** Copy additional root files into image