From e75c3bfbbdfde2b40d1bdd8205e7fc281eb23b7b Mon Sep 17 00:00:00 2001 From: Geoff Flarity Date: Thu, 13 Jul 2017 12:16:28 -0400 Subject: [PATCH 1/2] upgraded to ubuntu 16.04, dubinit 1.2.0, docker-linux 0.5.0 etc --- Dockerfile | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/Dockerfile b/Dockerfile index 482c7f3ba..a8dd33f2c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,28 +2,32 @@ # # Version 1.15 -FROM ubuntu:14.04 + +FROM ubuntu:16.04 MAINTAINER Kristian Haugene VOLUME /data VOLUME /config # Update packages and install software -RUN apt-get update \ +RUN apt-get update \ && apt-get -y install software-properties-common ufw \ && add-apt-repository multiverse \ && add-apt-repository ppa:transmissionbt/ppa \ && apt-get update \ - && apt-get install -y transmission-cli transmission-common transmission-daemon \ - && apt-get install -y openvpn curl rar unrar zip unzip wget \ - && curl -sLO https://github.com/Yelp/dumb-init/releases/download/v1.0.1/dumb-init_1.0.1_amd64.deb \ - && dpkg -i dumb-init_*.deb \ - && rm -rf dumb-init_*.deb \ + && apt-get install -y sudo transmission-cli transmission-common transmission-daemon curl rar unrar zip unzip wget \ + && wget -O - https://swupdate.openvpn.net/repos/repo-public.gpg|apt-key add - \ + && echo "deb http://build.openvpn.net/debian/openvpn/stable xenial main" > /etc/apt/sources.list.d/openvpn-aptrepo.list \ + && apt-get update \ + && apt-get install -y openvpn \ + && wget https://github.com/Yelp/dumb-init/releases/download/v1.2.0/dumb-init_1.2.0_amd64.deb \ + && dpkg -i dumb-init_1.2.0_amd64.deb \ + && rm -rf dumb-init_1.2.0_amd64.deb \ && apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* \ - && curl -L https://github.com/jwilder/dockerize/releases/download/v0.3.0/dockerize-linux-amd64-v0.3.0.tar.gz | tar -C /usr/local/bin -xzv \ + && curl -L https://github.com/jwilder/dockerize/releases/download/v0.5.0/dockerize-linux-amd64-v0.5.0.tar.gz | tar -C /usr/local/bin -xzv \ && groupmod -g 1000 users \ && useradd -u 911 -U -d /config -s /bin/false abc \ - && usermod -G users abc + && usermod -G users abc \ ADD openvpn/ /etc/openvpn/ ADD transmission/ /etc/transmission/ From 5c669fd8d0a1a21ab3c9beebdfce2b6e8dec85f1 Mon Sep 17 00:00:00 2001 From: Geoff Flarity Date: Thu, 13 Jul 2017 12:18:02 -0400 Subject: [PATCH 2/2] clean up Dockerfile --- Dockerfile | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index a8dd33f2c..345a03bd9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,6 @@ # # Version 1.15 - FROM ubuntu:16.04 MAINTAINER Kristian Haugene @@ -10,7 +9,7 @@ VOLUME /data VOLUME /config # Update packages and install software -RUN apt-get update \ +RUN apt-get update \ && apt-get -y install software-properties-common ufw \ && add-apt-repository multiverse \ && add-apt-repository ppa:transmissionbt/ppa \ @@ -27,7 +26,7 @@ RUN apt-get update \ && curl -L https://github.com/jwilder/dockerize/releases/download/v0.5.0/dockerize-linux-amd64-v0.5.0.tar.gz | tar -C /usr/local/bin -xzv \ && groupmod -g 1000 users \ && useradd -u 911 -U -d /config -s /bin/false abc \ - && usermod -G users abc \ + && usermod -G users abc ADD openvpn/ /etc/openvpn/ ADD transmission/ /etc/transmission/