From 8df36b4148daf268c674b86a268152edc932e28e Mon Sep 17 00:00:00 2001 From: sparklyballs Date: Thu, 25 Jan 2018 16:52:30 +0000 Subject: [PATCH 1/2] bump alpine 3.7 --- Dockerfile | 6 +++--- README.md | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 58bc18c..ffd4d36 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,13 +1,13 @@ -FROM lsiobase/alpine.nginx:3.6 -MAINTAINER sparklyballs +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="sparklyballs" -# install packages RUN \ + echo "**** install packages ****" && \ apk add --no-cache \ curl \ imagemagick \ diff --git a/README.md b/README.md index 49c6fa9..9203226 100644 --- a/README.md +++ b/README.md @@ -85,6 +85,7 @@ The easiest way to edit the configuration file is to enable local files editor f ## Versions ++ **25.01.18:** Rebase to alpine linux 3.7. + **25.05.17:** Rebase to alpine linux 3.6. + **03.05.17:** Use repo pinning to better solve dependencies, use repo version of php7-imagick. + **20.04.17:** Add php7-exif package, thanks iiska From 68256d0aab5009e03bf2cc1e17327acb0104255a Mon Sep 17 00:00:00 2001 From: sparklyballs Date: Thu, 25 Jan 2018 17:12:46 +0000 Subject: [PATCH 2/2] correct baseimage info README --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 9203226..c77fb23 100644 --- a/README.md +++ b/README.md @@ -47,7 +47,7 @@ http://192.168.x.x:8080 would show you what's running INSIDE the container on po * `-e PUID` for UserID - see below for explanation * `-e TZ` for setting timezone information, eg Europe/London -It is based on phusion-baseimage with ssh removed, for shell access whilst the container is running do `docker exec -it piwigo /bin/bash`. +It is based on alpine linux with s6 overlay, for shell access whilst the container is running do `docker exec -it piwigo /bin/bash`. ### User / Group Identifiers