From 1133440602be972ce12d8800bcfb205d2d964ec0 Mon Sep 17 00:00:00 2001 From: TheSpad Date: Wed, 1 Feb 2023 23:26:37 +0000 Subject: [PATCH 1/2] Delete EXTERNALLY-MANAGED for py install. --- Dockerfile | 9 ++++----- Dockerfile.aarch64 | 7 +++---- Dockerfile.armhf | 7 +++---- 3 files changed, 10 insertions(+), 13 deletions(-) diff --git a/Dockerfile b/Dockerfile index 7da8869..30a2b77 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,3 +1,5 @@ +# syntax=docker/dockerfile:1 + FROM ghcr.io/linuxserver/baseimage-alpine:edge # set version label @@ -17,13 +19,9 @@ RUN \ apk add -U --update --no-cache --virtual=build-dependencies \ build-base \ cargo \ - g++ \ - gcc \ - jq \ libffi-dev \ libxml2-dev \ libxslt-dev \ - make \ openssl-dev \ python3-dev && \ apk add -U --update --no-cache \ @@ -55,7 +53,8 @@ RUN \ /tmp/sabnzbd.tar.gz -C \ /app/sabnzbd --strip-components=1 && \ cd /app/sabnzbd && \ - python3 -m ensurepip && \ + rm -rf /usr/lib/python3.11/EXTERNALLY-MANAGED && \ + python3 -m ensurepip --upgrade && \ pip3 install -U --no-cache-dir \ pip \ wheel && \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 99813bd..529ed3e 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -1,3 +1,5 @@ +# syntax=docker/dockerfile:1 + FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-edge # set version label @@ -17,13 +19,9 @@ RUN \ apk add -U --update --no-cache --virtual=build-dependencies \ build-base \ cargo \ - g++ \ - gcc \ - jq \ libffi-dev \ libxml2-dev \ libxslt-dev \ - make \ openssl-dev \ python3-dev && \ apk add -U --update --no-cache \ @@ -55,6 +53,7 @@ RUN \ /tmp/sabnzbd.tar.gz -C \ /app/sabnzbd --strip-components=1 && \ cd /app/sabnzbd && \ + rm -rf /usr/lib/python3.11/EXTERNALLY-MANAGED && \ python3 -m ensurepip && \ pip3 install -U --no-cache-dir \ pip \ diff --git a/Dockerfile.armhf b/Dockerfile.armhf index a2a6148..506d196 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -1,3 +1,5 @@ +# syntax=docker/dockerfile:1 + FROM ghcr.io/linuxserver/baseimage-alpine:arm32v7-edge # set version label @@ -17,13 +19,9 @@ RUN \ apk add -U --update --no-cache --virtual=build-dependencies \ build-base \ cargo \ - g++ \ - gcc \ - jq \ libffi-dev \ libxml2-dev \ libxslt-dev \ - make \ openssl-dev \ python3-dev && \ apk add -U --update --no-cache \ @@ -55,6 +53,7 @@ RUN \ /tmp/sabnzbd.tar.gz -C \ /app/sabnzbd --strip-components=1 && \ cd /app/sabnzbd && \ + rm -rf /usr/lib/python3.11/EXTERNALLY-MANAGED && \ python3 -m ensurepip && \ pip3 install -U --no-cache-dir \ pip \ From 2cf4889ab389385fcf24785aa866f195f062cf7f Mon Sep 17 00:00:00 2001 From: TheSpad Date: Wed, 1 Feb 2023 23:26:49 +0000 Subject: [PATCH 2/2] Add shellcheck shell --- root/etc/s6-overlay/s6-rc.d/init-sabnzbd-config/run | 1 + root/etc/s6-overlay/s6-rc.d/svc-sabnzbd/run | 1 + 2 files changed, 2 insertions(+) diff --git a/root/etc/s6-overlay/s6-rc.d/init-sabnzbd-config/run b/root/etc/s6-overlay/s6-rc.d/init-sabnzbd-config/run index d692f2c..c72a055 100755 --- a/root/etc/s6-overlay/s6-rc.d/init-sabnzbd-config/run +++ b/root/etc/s6-overlay/s6-rc.d/init-sabnzbd-config/run @@ -1,4 +1,5 @@ #!/usr/bin/with-contenv bash +# shellcheck shell=bash # make folders mkdir -p \ diff --git a/root/etc/s6-overlay/s6-rc.d/svc-sabnzbd/run b/root/etc/s6-overlay/s6-rc.d/svc-sabnzbd/run index 4d95cf6..03928bc 100755 --- a/root/etc/s6-overlay/s6-rc.d/svc-sabnzbd/run +++ b/root/etc/s6-overlay/s6-rc.d/svc-sabnzbd/run @@ -1,4 +1,5 @@ #!/usr/bin/with-contenv bash +# shellcheck shell=bash FAMILY=::