Merge pull request #221 from linuxserver/buildbase-v1

Dockerfile

@@ -1,4 +1,6 @@
-FROM ghcr.io/linuxserver/baseimage-alpine:3.16
+# syntax=docker/dockerfile:1
+
+FROM ghcr.io/linuxserver/baseimage-alpine:3.17
 
 # set version label
 ARG BUILD_DATE
@@ -18,12 +20,11 @@ XDG_DATA_HOME="/config"
 RUN \
   echo "**** install build packages ****" && \
   apk add --no-cache --upgrade --virtual=build-dependencies \
-    make \
-    g++ \
-    gcc && \
+    build-base && \
   echo "**** install packages ****" && \
   apk add -U --update --no-cache \
     icu-libs \
+    openssl1.1-compat \
     p7zip \
     python3 && \
   echo "**** install unrar from source ****" && \

Dockerfile.aarch64

@@ -1,4 +1,6 @@
-FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.16
+# syntax=docker/dockerfile:1
+
+FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.17
 
 # set version label
 ARG BUILD_DATE
@@ -18,12 +20,11 @@ XDG_DATA_HOME="/config"
 RUN \
   echo "**** install build packages ****" && \
   apk add --no-cache --upgrade --virtual=build-dependencies \
-    make \
-    g++ \
-    gcc && \
+    build-base && \
   echo "**** install packages ****" && \
   apk add -U --update --no-cache \
     icu-libs \
+    openssl1.1-compat \
     p7zip \
     python3 && \
   echo "**** install unrar from source ****" && \

Dockerfile.armhf

@@ -1,4 +1,6 @@
-FROM ghcr.io/linuxserver/baseimage-alpine:arm32v7-3.16
+# syntax=docker/dockerfile:1
+
+FROM ghcr.io/linuxserver/baseimage-alpine:arm32v7-3.17
 
 # set version label
 ARG BUILD_DATE
@@ -18,12 +20,11 @@ XDG_DATA_HOME="/config"
 RUN \
   echo "**** install build packages ****" && \
   apk add --no-cache --upgrade --virtual=build-dependencies \
-    make \
-    g++ \
-    gcc && \
+    build-base && \
   echo "**** install packages ****" && \
   apk add -U --update --no-cache \
     icu-libs \
+    openssl1.1-compat \
     p7zip \
     python3 && \
   echo "**** install unrar from source ****" && \

readme-vars.yml

@@ -69,6 +69,7 @@ app_setup_block: |
 
 # changelog
 changelogs:
+  - { date: "15.01.23:", desc: "Rebase to Alpine 3.17, add openssl1.1-compat." }
   - { date: "29.11.22:", desc: "Add icu-libs to support qbittorrent-cli." }
   - { date: "30.10.22:", desc: "Add libtorrent v1 branch." }
   - { date: "31.08.22:", desc: "Rebase to Alpine Edge again to follow latest releases." }

root/etc/s6-overlay/s6-rc.d/init-qbittorrent-config/run

@@ -1,4 +1,5 @@
 #!/usr/bin/with-contenv bash
+# shellcheck shell=bash
 
 # make our folder
 mkdir -p /config/qBittorrent

root/etc/s6-overlay/s6-rc.d/svc-qbittorrent/run

@@ -1,4 +1,5 @@
 #!/usr/bin/with-contenv bash
+# shellcheck shell=bash
 
 WEBUI_PORT=${WEBUI_PORT:-8080}