From e31752860f39ae75ea7a7c7d98b5a7d61d374953 Mon Sep 17 00:00:00 2001
From: sparklyballs <sparklyballs@gmail.com>
Date: Thu, 7 Dec 2017 14:47:09 +0000
Subject: [PATCH] bump to alpine 3.7 and fix continuation lines
---
Dockerfile | 25 ++++++++++---------------
README.md | 1 +
2 files changed, 11 insertions(+), 15 deletions(-)
diff --git a/Dockerfile b/Dockerfile
index 254b9c9..db7dfc8 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,16 +1,16 @@
-FROM lsiobase/alpine:3.6
-MAINTAINER Gonzalo Peci <davyjones@linuxserver.io>, sparklyballs
-
-#Â environment variables
-ENV PYTHON_EGG_CACHE="/config/plugins/.python-eggs"
+FROM lsiobase/alpine:3.7
# set version label
ARG BUILD_DATE
ARG VERSION
LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
+LABEL maintainer="sparklyballs"
+
+#Â environment variables
+ENV PYTHON_EGG_CACHE="/config/plugins/.python-eggs"
-#Â install build packages
RUN \
+ echo "**** install build packages ****" && \
apk add --no-cache --virtual=build-dependencies \
g++ \
gcc \
@@ -18,23 +18,19 @@ RUN \
openssl-dev \
py2-pip \
python2-dev && \
-
-#Â install runtime packages
+ echo "**** install runtime packages ****" && \
apk add --no-cache \
ca-certificates \
curl \
+ libressl2.6-libssl \
openssl \
p7zip \
unrar \
unzip && \
- apk add --no-cache \
- --repository http://nl.alpinelinux.org/alpine/edge/main \
- libressl2.6-libssl && \
apk add --no-cache \
--repository http://nl.alpinelinux.org/alpine/edge/testing \
deluge && \
-
-# install pip packages
+ echo "**** install pip packages ****" && \
pip install --no-cache-dir -U \
incremental \
pip && \
@@ -47,8 +43,7 @@ RUN \
six \
twisted \
zope.interface && \
-
-#Â cleanup
+ echo "**** cleanup ****" && \
apk del --purge \
build-dependencies && \
rm -rf \
diff --git a/README.md b/README.md
index 1f14148..7b40cdc 100644
--- a/README.md
+++ b/README.md
@@ -89,6 +89,7 @@ Change the downloads location in the webui in Preferences->Downloads and use /do
## Versions
++ **07.12.17:** Rebase to alpine 3.7.
+ **20.11.17:** Change libressl2.6-libssl repo.
+ **01.07.17:** Add curl package.
+ **26.05.17:** Rebase to alpine 3.6.
--
GitLab