bea/docker-deluge-openvpn
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update package install after #562

Browse Source
This commit is contained in:
Kristian Haugene
2018-07-25 17:05:04 +02:00
parent d278020dc3
commit fdeebe4248
3 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Dockerfile
View File

@@ -7,7 +7,7 @@ VOLUME /config
# Update packages and install software # Update packages and install software
RUN apt-get update \ RUN apt-get update \
&& apt-get -y upgrade \ && apt-get -y upgrade \
&& apt-get -y install software-properties-common wget git \ && apt-get -y install software-properties-common wget git curl jq \
&& add-apt-repository ppa:transmissionbt/ppa \ && add-apt-repository ppa:transmissionbt/ppa \
&& wget -O - https://swupdate.openvpn.net/repos/repo-public.gpg | apt-key add - \ && 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 \ && echo "deb http://build.openvpn.net/debian/openvpn/stable xenial main" > /etc/apt/sources.list.d/openvpn-aptrepo.list \
@@ -32,10 +32,6 @@ RUN apt-get update \
&& useradd -u 911 -U -d /config -s /bin/false abc \ && useradd -u 911 -U -d /config -s /bin/false abc \
&& usermod -G users abc && usermod -G users abc
RUN apt-get update \
&& apt-get install -y curl \
&& apt-get install -y jq
ADD openvpn/ /etc/openvpn/ ADD openvpn/ /etc/openvpn/
ADD transmission/ /etc/transmission/ ADD transmission/ /etc/transmission/
ADD tinyproxy /opt/tinyproxy/ ADD tinyproxy /opt/tinyproxy/

2
Dockerfile.alpine
View File

@@ -6,7 +6,7 @@ VOLUME /config
ENV DOCKERIZE_VERSION=v0.6.0 ENV DOCKERIZE_VERSION=v0.6.0
RUN echo "@testing http://dl-cdn.alpinelinux.org/alpine/edge/testing" >> /etc/apk/repositories \ RUN echo "@testing http://dl-cdn.alpinelinux.org/alpine/edge/testing" >> /etc/apk/repositories \
&& apk --no-cache add bash dumb-init ip6tables ufw@testing openvpn shadow transmission-daemon \ && apk --no-cache add bash dumb-init ip6tables ufw@testing openvpn shadow transmission-daemon curl jq \
&& echo "Install dockerize $DOCKERIZE_VERSION" \ && echo "Install dockerize $DOCKERIZE_VERSION" \
&& wget -qO- https://github.com/jwilder/dockerize/releases/download/$DOCKERIZE_VERSION/dockerize-linux-amd64-$DOCKERIZE_VERSION.tar.gz | tar xz -C /usr/bin \ && wget -qO- https://github.com/jwilder/dockerize/releases/download/$DOCKERIZE_VERSION/dockerize-linux-amd64-$DOCKERIZE_VERSION.tar.gz | tar xz -C /usr/bin \
&& mkdir -p /opt/transmission-ui \ && mkdir -p /opt/transmission-ui \

2
Dockerfile.armhf
View File

@@ -7,7 +7,7 @@ VOLUME /config
# Update packages and install software # Update packages and install software
RUN apt-get update \ RUN apt-get update \
&& apt-get -y install transmission-cli transmission-common transmission-daemon \ && apt-get -y install transmission-cli transmission-common transmission-daemon \
&& apt-get install -y dumb-init unzip openvpn curl ufw git tinyproxy \ && apt-get install -y dumb-init unzip openvpn curl ufw git tinyproxy jq \
&& curl -L -o /tmp/release.zip https://github.com/Secretmapper/combustion/archive/release.zip \ && curl -L -o /tmp/release.zip https://github.com/Secretmapper/combustion/archive/release.zip \
&& unzip /tmp/release.zip -d /opt/transmission-ui/ \ && unzip /tmp/release.zip -d /opt/transmission-ui/ \
&& rm /tmp/release.zip \ && rm /tmp/release.zip \