Skip to content

Commit

Permalink
See commit description
Browse files Browse the repository at this point in the history
- Fix exec permissions
- Combine apk add command and s6-overlay install
- Update default version of qBittorrent
- Sort packages in apk add command
  • Loading branch information
Trigus42 committed Jan 25, 2022
1 parent e3e2fc8 commit 01a9a67
Show file tree
Hide file tree
Showing 2 changed files with 39 additions and 39 deletions.
31 changes: 16 additions & 15 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,46 +1,47 @@
FROM alpine:3.14

# You can find the available package versions at https://pkgs.alpinelinux.org/packages?name=qbittorrent-nox
ARG QBITTORRENT_VERSION="4.3.8-r0"
ARG QBITTORRENT_VERSION="4.4.0-r0"
# You can find the available release tags at https://github.com/just-containers/s6-overlay/releases
ARG S6_OVERLAY_VERSION="v2.2.0.3"

# Exit if one of the cont-init.d scripts fails
ENV S6_BEHAVIOUR_IF_STAGE2_FAILS=2

COPY ./build/s6-overlay-arch /tmp/s6-overlay-arch
COPY rootfs /

RUN \
# Install tools
apk add --no-cache \
bash \
wget \
wireguard-tools \
dos2unix \
openvpn \
grep \
net-tools \
openresolv \
iptables \
ipcalc \
iptables \
iputils \
libexecinfo \
net-tools \
openresolv \
openssl \
openvpn \
qt5-qtbase \
libexecinfo \
tzdata; \
tzdata \
wget \
wireguard-tools; \
# Install qbittorrent-nox
apk add --no-cache \
-X http://dl-cdn.alpinelinux.org/alpine/edge/main \
-X http://dl-cdn.alpinelinux.org/alpine/edge/community \
-X http://dl-cdn.alpinelinux.org/alpine/edge/testing \
qbittorrent-nox=${QBITTORRENT_VERSION}; \
exit 0

# Install s6-overlay
COPY ./build/s6-overlay-arch /tmp/s6-overlay-arch
RUN \
# Install s6-overlay
chmod +x /tmp/s6-overlay-arch; \
wget https://github.com/just-containers/s6-overlay/releases/download/${S6_OVERLAY_VERSION}/s6-overlay-$(/tmp/s6-overlay-arch).tar.gz -O /tmp/s6_overlay.tar.gz; \
tar -xf /tmp/s6_overlay.tar.gz -C /; \
rm -r /tmp/*
rm -r /tmp/*; \
# Set exec permissions
chmod +x -R /helper/ /etc/cont-init.d/ /etc/services.d/

COPY rootfs /

Expand Down
47 changes: 23 additions & 24 deletions Dockerfile.compile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ FROM alpine:3.14 as builder

ARG BUILD_DATE
# You can find release tags at https://github.com/qbittorrent/qBittorrent/releases
ARG QBITTORRENT_VERSION="release-4.3.9"
ARG QBITTORRENT_VERSION="release-4.4.0"

WORKDIR /root/

Expand Down Expand Up @@ -64,36 +64,35 @@ RUN \
# Remove build files
rm -r /root/libtorrent /root/qbittorrent

COPY ./build/s6-overlay-arch /tmp/s6-overlay-arch
COPY rootfs /

RUN \
# Install tools
apk update; \
apk add --no-cache \
wget \
bash \
wireguard-tools \
dos2unix \
openvpn \
grep \
net-tools \
openresolv \
iptables \
ipcalc \
iputils \
openssl \
qt5-qtbase \
libexecinfo \
tzdata; \
exit 0

# Install s6-overlay
COPY ./build/s6-overlay-arch /tmp/s6-overlay-arch
RUN \
bash \
dos2unix \
grep \
ipcalc \
iptables \
iputils \
libexecinfo \
net-tools \
openresolv \
openssl \
openvpn \
qt5-qtbase \
tzdata \
wget \
wireguard-tools; \
# Install s6-overlay
chmod +x /tmp/s6-overlay-arch; \
wget https://github.com/just-containers/s6-overlay/releases/download/${S6_OVERLAY_VERSION}/s6-overlay-$(/tmp/s6-overlay-arch).tar.gz -O /tmp/s6_overlay.tar.gz; \
tar -xf /tmp/s6_overlay.tar.gz -C /; \
rm -r /tmp/*

COPY rootfs /
rm -r /tmp/*; \
# Set exec permissions
chmod +x -R /helper/ /etc/cont-init.d/ /etc/services.d/

VOLUME /config /downloads
EXPOSE 8080
Expand Down

0 comments on commit 01a9a67

Please sign in to comment.