Skip to content
This repository has been archived by the owner on Nov 25, 2022. It is now read-only.

Commit

Permalink
feat: ugprade alpine linux
Browse files Browse the repository at this point in the history
  • Loading branch information
guillaumedsde committed Sep 16, 2022
1 parent f487119 commit 7c80c6e
Show file tree
Hide file tree
Showing 2 changed files with 25 additions and 25 deletions.
48 changes: 24 additions & 24 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
ARG BASE_IMAGE="alpine:3.15"
ARG BASE_IMAGE="alpine:3.16"
# uncomment below to enable qbittorrent search engine
# ARG BASE_IMAGE="python:3-alpine3.15"
# ARG BASE_IMAGE="python:3-alpine3.16"

# hadolint ignore=DL3006
FROM ${BASE_IMAGE}
Expand All @@ -23,28 +23,28 @@ LABEL org.label-schema.build-date=$BUILD_DATE \
COPY rootfs /

# hadolint ignore=DL3018
RUN addgroup -S openvpn \
&& adduser -SD \
-s /sbin/nologin \
-g openvpn \
-G openvpn \
openvpn \
&& apk add --no-cache \
bash \
bind-tools \
openvpn \
curl \
iptables \
libcap \
sudo \
subversion \
jq \
&& apk add --no-cache s6-overlay \
&& setcap cap_net_admin+ep "$(which openvpn)" \
&& apk del libcap --purge \
&& echo "openvpn ALL=(ALL) NOPASSWD: /sbin/ip" >> /etc/sudoers \
&& /bin/sh /usr/sbin/install_qbittorrent.sh \
&& chmod +x /usr/sbin/healthcheck.sh
RUN addgroup -S openvpn &&
adduser -SD \
-s /sbin/nologin \
-g openvpn \
-G openvpn \
openvpn &&
apk add --no-cache \
bash \
bind-tools \
openvpn \
curl \
iptables \
libcap \
sudo \
subversion \
jq &&
apk add --no-cache s6-overlay &&
setcap cap_net_admin+ep "$(which openvpn)" &&
apk del libcap --purge &&
echo "openvpn ALL=(ALL) NOPASSWD: /sbin/ip" >>/etc/sudoers &&
/bin/sh /usr/sbin/install_qbittorrent.sh &&
chmod +x /usr/sbin/healthcheck.sh

ENV CONFIG_DIR=/config \
QBT_SAVE_PATH=/downloads \
Expand Down
2 changes: 1 addition & 1 deletion build/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ if [ "${CI_COMMIT_REF_PROTECTED}" = "true" ]; then
--build-arg BUILD_DATE="$(date -u +"%Y-%m-%dT%H:%M:%SZ")" \
--build-arg VCS_REF="$(git rev-parse --short HEAD)" \
--build-arg VERSION="python" \
--build-arg BASE_IMAGE="python:3-alpine3.15" \
--build-arg BASE_IMAGE="python:3-alpine3.16" \
-t "${CI_REGISTRY_USER}/alpine-qbittorrent-openvpn:python" \
--push
TAGS=" -t ${CI_REGISTRY_USER}/alpine-qbittorrent-openvpn:${VERSION} -t ${CI_REGISTRY_USER}/alpine-qbittorrent-openvpn:latest "
Expand Down

0 comments on commit 7c80c6e

Please sign in to comment.