Rebase master to 3.17

linuxserver · Mar 5, 2023 · 39f728f · 39f728f
1 parent 1b4a421
commit 39f728f
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 13 deletions.
diff --git a/Dockerfile b/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 UNRAR_VERSION=6.1.7
@@ -14,9 +16,7 @@ ENV PYTHONIOENCODING="UTF-8"
 RUN \
   echo "**** install build packages ****" && \
   apk add --no-cache --upgrade --virtual=build-dependencies \
-    make \
-    g++ \
-    gcc && \
+    build-base && \
   echo "**** install packages ****" && \
   apk add --no-cache \
     py3-cheetah \

diff --git a/Dockerfile.aarch64 b/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 UNRAR_VERSION=6.1.7
@@ -11,13 +13,10 @@ LABEL maintainer="xe, homerr"
 # set python to use utf-8 rather than ascii.
 ENV PYTHONIOENCODING="UTF-8"
 
-
 RUN \
   echo "**** install build packages ****" && \
   apk add --no-cache --upgrade --virtual=build-dependencies \
-    make \
-    g++ \
-    gcc && \
+    build-base && \
   echo "**** install packages ****" && \
   apk add --no-cache \
     py3-cheetah \

diff --git a/Dockerfile.armhf b/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 UNRAR_VERSION=6.1.7
@@ -14,9 +16,7 @@ ENV PYTHONIOENCODING="UTF-8"
 RUN \
   echo "**** install build packages ****" && \
   apk add --no-cache --upgrade --virtual=build-dependencies \
-    make \
-    g++ \
-    gcc && \
+    build-base && \
   echo "**** install packages ****" && \
   apk add --no-cache \
     py3-cheetah \

diff --git a/README.md b/README.md
@@ -258,6 +258,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
 
 ## Versions
 
+* **05.03.23:** - Rebase to Alpine 3.17.
 * **18.11.22:** - Update service file from legacy SickBeard.py to sickgear.py.
 * **10.10.22:** - Rebase to Alpine 3.16, migrate to s6v3.
 * **19.09.22:** - Rebase to alpine 3.15. Build unrar from source.

diff --git a/readme-vars.yml b/readme-vars.yml
@@ -66,6 +66,7 @@ app_setup_block: |
 
 # changelog
 changelogs:
+  - { date: "05.03.23:", desc: "Rebase to Alpine 3.17." }
   - { date: "18.11.22:", desc: "Update service file from legacy SickBeard.py to sickgear.py." }
   - { date: "10.10.22:", desc: "Rebase to Alpine 3.16, migrate to s6v3." }
   - { date: "19.09.22:", desc: "Rebase to alpine 3.15. Build unrar from source." }

diff --git a/root/etc/s6-overlay/s6-rc.d/init-sickgear-config/run b/root/etc/s6-overlay/s6-rc.d/init-sickgear-config/run
@@ -1,4 +1,5 @@
 #!/usr/bin/with-contenv bash
+# shellcheck shell=bash
 
 #make our folders and links
 mkdir -p \

diff --git a/root/etc/s6-overlay/s6-rc.d/svc-sickgear/run b/root/etc/s6-overlay/s6-rc.d/svc-sickgear/run
@@ -1,4 +1,5 @@
 #!/usr/bin/with-contenv bash
+# shellcheck shell=bash
 
 exec \
     s6-notifyoncheck -d -n 300 -w 1000 -c "nc -z localhost 8081" \