From 943e0e73946f563c3d115547174ca794b03f9194 Mon Sep 17 00:00:00 2001
From: sparklyballs <sparklyballs@gmail.com>
Date: Thu, 17 Nov 2016 10:47:43 +0000
Subject: [PATCH] switch to edge baseimage, image now builds
---
Dockerfile | 22 +++++++++-------------
README.md | 1 +
2 files changed, 10 insertions(+), 13 deletions(-)
diff --git a/Dockerfile b/Dockerfile
index 4967085..875b329 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM lsiobase/alpine
+FROM lsiobase/alpine:edge
MAINTAINER Gonzalo Peci <davyjones@linuxserver.io>, sparklyballs
#Â environment variables
@@ -12,13 +12,10 @@ LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DA
#Â install runtime packages
RUN \
apk add --no-cache \
+ libressl2.4-libssl \
p7zip \
- python \
unrar \
unzip && \
- apk add --no-cache \
- --repository http://nl.alpinelinux.org/alpine/edge/main \
- libressl2.4-libssl && \
apk add --no-cache \
--repository http://nl.alpinelinux.org/alpine/edge/testing \
deluge && \
@@ -28,14 +25,14 @@ RUN \
g++ \
gcc \
libffi-dev \
- py-pip \
- python-dev && \
-
- apk add --no-cache --virtual=build-dependencies2 \
- --repository http://nl.alpinelinux.org/alpine/edge/main \
- libressl-dev && \
+ libressl-dev \
+ py2-pip \
+ python2-dev && \
# install pip packages
+ pip install --no-cache-dir -U \
+ incremental \
+ pip && \
pip install --no-cache-dir -U \
crypto \
mako \
@@ -48,8 +45,7 @@ RUN \
#Â cleanup
apk del --purge \
- build-dependencies \
- build-dependencies2 && \
+ build-dependencies && \
rm -rf \
/root/.cache
diff --git a/README.md b/README.md
index 7c14e52..7d1bccd 100644
--- a/README.md
+++ b/README.md
@@ -87,6 +87,7 @@ Change the downloads location in the webui in Preferences->Downloads and use /do
## Versions
++ **17.11.16:** Rebase to edge baseimage.
+ **13.10.16:** Switch to libressl as openssl deprecated from alpine linux and deluge dependency
no longer installs.
+ **30.09.16:** Fix umask.
--
GitLab