From e8ab6e2f6fbde764850bd920123a9e02f266d64d Mon Sep 17 00:00:00 2001 From: guillaumedsde Date: Fri, 16 Sep 2022 12:51:00 +0200 Subject: [PATCH] feat: ugprade alpine linux --- Dockerfile | 32 ++++++++++++++++---------------- build/build.sh | 2 +- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/Dockerfile b/Dockerfile index 67fbbcc..562a338 100644 --- a/Dockerfile +++ b/Dockerfile @@ -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} @@ -25,24 +25,24 @@ COPY rootfs / # hadolint ignore=DL3018 RUN addgroup -S openvpn \ && adduser -SD \ - -s /sbin/nologin \ - -g openvpn \ - -G openvpn \ - openvpn \ + -s /sbin/nologin \ + -g openvpn \ + -G openvpn \ + openvpn \ && apk add --no-cache \ - bash \ - bind-tools \ - openvpn \ - curl \ - iptables \ - libcap \ - sudo \ - subversion \ - jq \ + 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 \ + && echo "openvpn ALL=(ALL) NOPASSWD: /sbin/ip" >>/etc/sudoers \ && /bin/sh /usr/sbin/install_qbittorrent.sh \ && chmod +x /usr/sbin/healthcheck.sh diff --git a/build/build.sh b/build/build.sh index a47516b..b6bba4f 100644 --- a/build/build.sh +++ b/build/build.sh @@ -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 "