Merge pull request #55 from linuxserver/pipeline

Rebase to bionic, add multi-arch

Dockerfile

@@ -1,40 +1,37 @@
-FROM lsiobase/alpine:edge
+FROM lsiobase/ubuntu:bionic
 
 # set version label
 ARG BUILD_DATE
 ARG VERSION
+ARG DELUGE_VERSION
 LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
-LABEL maintainer="sparklyballs"
+LABEL maintainer="sparklyballs, aptalca"
 
-# environment variables
+# environment variables
 ENV PYTHON_EGG_CACHE="/config/plugins/.python-eggs"
 
+# install software
 RUN \
-  echo "**** install build packages ****" && \
- apk add --no-cache --virtual=build-dependencies \
-	g++ \
-	gcc \
-	libffi-dev \
-	openssl-dev \
-	py2-pip \
-	python2-dev && \
- echo "**** install runtime packages ****" && \
- apk add --no-cache \
-	ca-certificates \
-	curl \
-	libressl2.7-libssl \
-	openssl \
+ echo "**** install packages ****" && \
+ apt-get update && \
+ apt-get install -y \
+	deluged \
+	deluge-web \
 	p7zip \
 	unrar \
-	unzip && \
- apk add --no-cache \
-	--repository http://nl.alpinelinux.org/alpine/edge/testing \
-	deluge && \
+	unzip \
+	libssl1.0.0 \
+	openssl && \
+ echo "**** install build deps ****" && \
+ apt-get install -y \
+	libssl-dev \
+	python-dev \
+	build-essential \
+	libffi-dev \
+	python-pip && \
  echo "**** install pip packages ****" && \
  pip install --no-cache-dir -U \
 	incremental \
-	pip && \
- pip install --no-cache-dir -U \
 	crypto \
 	mako \
 	markupsafe \
@@ -44,10 +41,18 @@ RUN \
 	twisted \
 	zope.interface && \
  echo "**** cleanup ****" && \
- apk del --purge \
-	build-dependencies && \
+ apt-get purge -y \
+	libssl-dev \
+	python-dev \
+	build-essential \
+	libffi-dev \
+	python-pip && \
+ apt-get --purge autoremove -y && \
+ apt-get clean && \
  rm -rf \
-	/root/.cache
+	/tmp/* \
+	/var/lib/apt/lists/* \
+	/var/tmp/*
 
 # add local files
 COPY root/ /

Dockerfile.aarch64

@@ -0,0 +1,65 @@
+FROM lsiobase/ubuntu.arm64:bionic
+
+# Add qemu to build on x86_64 systems
+COPY qemu-aarch64-static /usr/bin
+
+# set version label
+ARG BUILD_DATE
+ARG VERSION
+ARG DELUGE_VERSION
+LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
+LABEL maintainer="sparklyballs, aptalca"
+
+# environment variables
+ENV PYTHON_EGG_CACHE="/config/plugins/.python-eggs"
+
+# install software
+RUN \
+ echo "**** install packages ****" && \
+ apt-get update && \
+ apt-get install -y \
+	deluged \
+	deluge-web \
+	p7zip \
+	unrar \
+	unzip \
+	libssl1.0.0 \
+	openssl && \
+ echo "**** install build deps ****" && \
+ apt-get install -y \
+	libssl-dev \
+	python-dev \
+	build-essential \
+	libffi-dev \
+	python-pip && \
+ echo "**** install pip packages ****" && \
+ pip install --no-cache-dir -U \
+	incremental \
+	crypto \
+	mako \
+	markupsafe \
+	pyopenssl \
+	service_identity \
+	six \
+	twisted \
+	zope.interface && \
+ echo "**** cleanup ****" && \
+ apt-get purge -y \
+	libssl-dev \
+	python-dev \
+	build-essential \
+	libffi-dev \
+	python-pip && \
+ apt-get --purge autoremove -y && \
+ apt-get clean && \
+ rm -rf \
+	/tmp/* \
+	/var/lib/apt/lists/* \
+	/var/tmp/*
+
+# add local files
+COPY root/ /
+
+# ports and volumes
+EXPOSE 8112 58846 58946 58946/udp
+VOLUME /config /downloads

Dockerfile.armhf

@@ -0,0 +1,65 @@
+FROM lsiobase/ubuntu.armhf:bionic
+
+# Add qemu to build on x86_64 systems
+COPY qemu-arm-static /usr/bin
+
+# set version label
+ARG BUILD_DATE
+ARG VERSION
+ARG DELUGE_VERSION
+LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
+LABEL maintainer="sparklyballs, aptalca"
+
+# environment variables
+ENV PYTHON_EGG_CACHE="/config/plugins/.python-eggs"
+
+# install software
+RUN \
+ echo "**** install packages ****" && \
+ apt-get update && \
+ apt-get install -y \
+	deluged \
+	deluge-web \
+	p7zip \
+	unrar \
+	unzip \
+	libssl1.0.0 \
+	openssl && \
+ echo "**** install build deps ****" && \
+ apt-get install -y \
+	libssl-dev \
+	python-dev \
+	build-essential \
+	libffi-dev \
+	python-pip && \
+ echo "**** install pip packages ****" && \
+ pip install --no-cache-dir -U \
+	incremental \
+	crypto \
+	mako \
+	markupsafe \
+	pyopenssl \
+	service_identity \
+	six \
+	twisted \
+	zope.interface && \
+ echo "**** cleanup ****" && \
+ apt-get purge -y \
+	libssl-dev \
+	python-dev \
+	build-essential \
+	libffi-dev \
+	python-pip && \
+ apt-get --purge autoremove -y && \
+ apt-get clean && \
+ rm -rf \
+	/tmp/* \
+	/var/lib/apt/lists/* \
+	/var/tmp/*
+
+# add local files
+COPY root/ /
+
+# ports and volumes
+EXPOSE 8112 58846 58946 58946/udp
+VOLUME /config /downloads