From 3eeec9688b4b941fbe22a10469a259cd8bdad5cd Mon Sep 17 00:00:00 2001 From: sparklyballs Date: Wed, 12 Apr 2017 23:44:04 +0100 Subject: [PATCH 1/2] sed in place --- Dockerfile | 2 +- README.md | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 8971c35..b0d2a6f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -18,7 +18,7 @@ RUN \ # fix path to cropper.js RUN \ - sed 's#src="/cropper/#/src="cropper/#' /etc/smokeping/basepage.html + sed -i 's#src="/cropper/#/src="cropper/#' /etc/smokeping/basepage.html # add local files COPY root/ / diff --git a/README.md b/README.md index 725e2d4..2c3232f 100644 --- a/README.md +++ b/README.md @@ -76,6 +76,7 @@ Wait 10 minutes. **Version** ++ **12.04.17:** Fix cropper.js path, thanks nibbledeez. + **09.02.17:** Rebase to alpine 3.5. + **17.10.16:** Add ttf-dejavu package as per [LT forum](http://lime-technology.com/forum/index.php?topic=43602.msg507875#msg507875). + **10.09.16:** Add layer badges to README. From fc03e3d34b99fc8358bfd1d6e4f870f940f9d2e9 Mon Sep 17 00:00:00 2001 From: sparklyballs Date: Wed, 12 Apr 2017 23:49:39 +0100 Subject: [PATCH 2/2] consolidate layers --- Dockerfile | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index b0d2a6f..af8c12b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,12 @@ FROM lsiobase/alpine:3.5 MAINTAINER LinuxServer.io , sparklyballs -# install packages +# set version label +ARG BUILD_DATE +ARG VERSION +LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}" + +# install packages RUN \ apk add --no-cache \ apache2 \ @@ -10,14 +15,12 @@ RUN \ smokeping \ ssmtp \ sudo \ - ttf-dejavu + ttf-dejavu && \ -# give abc sudo access to traceroute -RUN \ - echo "abc ALL=(ALL) NOPASSWD: /usr/bin/traceroute" >> /etc/sudoers.d/traceroute +# give abc sudo access to traceroute + echo "abc ALL=(ALL) NOPASSWD: /usr/bin/traceroute" >> /etc/sudoers.d/traceroute && \ # fix path to cropper.js -RUN \ sed -i 's#src="/cropper/#/src="cropper/#' /etc/smokeping/basepage.html # add local files