diff --git a/.github/workflows/call_invalid_helper.yml b/.github/workflows/call_invalid_helper.yml old mode 100755 new mode 100644 diff --git a/.github/workflows/permissions.yml b/.github/workflows/permissions.yml old mode 100755 new mode 100644 diff --git a/Dockerfile b/Dockerfile index 824be45..c3e4ae4 100644 --- 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 BUILD_DATE @@ -13,14 +15,12 @@ RUN \ echo "**** install build packages ****" && \ apk add --no-cache --upgrade --virtual=build-dependencies \ cargo \ - g++ \ - gcc \ + build-base \ libffi-dev \ openssl-dev \ python3-dev && \ echo "**** install runtime packages ****" && \ apk add --no-cache --upgrade \ - py3-pip \ python3 \ uwsgi \ uwsgi-python && \ @@ -37,14 +37,17 @@ RUN \ /app/apprise-api/ --strip-components=1 && \ echo "**** install pip packages ****" && \ cd /app/apprise-api && \ - pip3 install -U --no-cache-dir pip wheel && \ - pip install -U --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.16/ -r requirements.txt && \ + python3 -m ensurepip --upgrade && \ + pip3 install -U --no-cache-dir \ + pip \ + wheel && \ + pip3 install -U --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.17/ -r requirements.txt && \ echo "**** cleanup ****" && \ apk del --purge \ build-dependencies && \ rm -rf \ - /root/.cache \ - /root/.cargo \ + $HOME/.cache \ + $HOME/.cargo \ /tmp/* # copy local files diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 8235b3f..2cdbc8e 100644 --- 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 BUILD_DATE @@ -13,14 +15,12 @@ RUN \ echo "**** install build packages ****" && \ apk add --no-cache --upgrade --virtual=build-dependencies \ cargo \ - g++ \ - gcc \ + build-base \ libffi-dev \ openssl-dev \ python3-dev && \ echo "**** install runtime packages ****" && \ apk add --no-cache --upgrade \ - py3-pip \ python3 \ uwsgi \ uwsgi-python && \ @@ -37,8 +37,11 @@ RUN \ /app/apprise-api/ --strip-components=1 && \ echo "**** install pip packages ****" && \ cd /app/apprise-api && \ - pip3 install -U --no-cache-dir pip wheel && \ - pip install -U --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.16/ -r requirements.txt && \ + python3 -m ensurepip --upgrade && \ + pip3 install -U --no-cache-dir \ + pip \ + wheel && \ + pip install -U --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.17/ -r requirements.txt && \ echo "**** cleanup ****" && \ apk del --purge \ build-dependencies && \ diff --git a/Dockerfile.armhf b/Dockerfile.armhf index eb1bf52..628f750 100644 --- 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 BUILD_DATE @@ -13,14 +15,12 @@ RUN \ echo "**** install build packages ****" && \ apk add --no-cache --upgrade --virtual=build-dependencies \ cargo \ - g++ \ - gcc \ + build-base \ libffi-dev \ openssl-dev \ python3-dev && \ echo "**** install runtime packages ****" && \ apk add --no-cache --upgrade \ - py3-pip \ python3 \ uwsgi \ uwsgi-python && \ @@ -37,8 +37,11 @@ RUN \ /app/apprise-api/ --strip-components=1 && \ echo "**** install pip packages ****" && \ cd /app/apprise-api && \ - pip3 install -U --no-cache-dir pip wheel && \ - pip install -U --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.16/ -r requirements.txt && \ + python3 -m ensurepip --upgrade && \ + pip3 install -U --no-cache-dir \ + pip \ + wheel && \ + pip install -U --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.17/ -r requirements.txt && \ echo "**** cleanup ****" && \ apk del --purge \ build-dependencies && \ diff --git a/README.md b/README.md index 2dcd4f8..ac57ec6 100644 --- a/README.md +++ b/README.md @@ -224,6 +224,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions +* **11.02.23:** - Rebase to Alpine 3.17. * **17.10.22:** - Rebase to alpine 3.16, migrate to S6V3 * **28.02.21:** - Rebase to alpine 3.15. * **03.11.21:** - Increase uWSGI buffer size to 32kb. diff --git a/readme-vars.yml b/readme-vars.yml index cba99c5..34469cb 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -78,7 +78,8 @@ app_setup_block: [] # changelog changelogs: - - { date: "17.10.22:", desc: "Rebase to alpine 3.16, migrate to S6V3"} + - { date: "11.02.23:", desc: "Rebase to Alpine 3.17."} + - { date: "17.10.22:", desc: "Rebase to alpine 3.16, migrate to S6V3" } - { date: "28.02.21:", desc: "Rebase to alpine 3.15." } - { date: "03.11.21:", desc: "Increase uWSGI buffer size to 32kb." } - { date: "16.05.21:", desc: "Add linuxserver wheel index." } diff --git a/root/etc/s6-overlay/s6-rc.d/init-apprise-config/run b/root/etc/s6-overlay/s6-rc.d/init-apprise-config/run index 159aae2..efea851 100755 --- a/root/etc/s6-overlay/s6-rc.d/init-apprise-config/run +++ b/root/etc/s6-overlay/s6-rc.d/init-apprise-config/run @@ -2,5 +2,5 @@ # shellcheck shell=bash # permissions -chown -R abc:abc \ - /config \ No newline at end of file +lsiown -R abc:abc \ + /config diff --git a/root/etc/s6-overlay/s6-rc.d/svc-apprise/run b/root/etc/s6-overlay/s6-rc.d/svc-apprise/run index 49e2b7c..aeff78f 100755 --- a/root/etc/s6-overlay/s6-rc.d/svc-apprise/run +++ b/root/etc/s6-overlay/s6-rc.d/svc-apprise/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 8000" \