Merge pull request #9 from linuxserver/3.18

This commit is contained in:
Roxedus 2023-07-11 18:46:18 +02:00 committed by GitHub
commit 58c1598602
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 16 additions and 14 deletions

View File

@ -1,6 +1,6 @@
# syntax=docker/dockerfile:1
FROM ghcr.io/linuxserver/baseimage-alpine:3.17
FROM ghcr.io/linuxserver/baseimage-alpine:3.18
# set version label
ARG BUILD_DATE
@ -37,11 +37,11 @@ RUN \
/app/apprise-api/ --strip-components=1 && \
echo "**** install pip packages ****" && \
cd /app/apprise-api && \
python3 -m ensurepip --upgrade && \
pip3 install -U --no-cache-dir \
python3 -m venv /lsiopy && \
pip 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 && \
pip install -U --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.18/ -r requirements.txt && \
echo "**** cleanup ****" && \
apk del --purge \
build-dependencies && \

View File

@ -1,6 +1,6 @@
# syntax=docker/dockerfile:1
FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.17
FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.18
# set version label
ARG BUILD_DATE
@ -37,17 +37,17 @@ RUN \
/app/apprise-api/ --strip-components=1 && \
echo "**** install pip packages ****" && \
cd /app/apprise-api && \
python3 -m ensurepip --upgrade && \
pip3 install -U --no-cache-dir \
python3 -m venv /lsiopy && \
pip 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 && \
pip install -U --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.18/ -r requirements.txt && \
echo "**** cleanup ****" && \
apk del --purge \
build-dependencies && \
rm -rf \
/root/.cache \
/root/.cargo \
$HOME/.cache \
$HOME/.cargo \
/tmp/*
# copy local files

View File

@ -224,6 +224,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
## Versions
* **10.07.23:** - Rebase to Alpine 3.18.
* **01.07.23:** - Deprecate armhf. As announced [here](https://www.linuxserver.io/blog/a-farewell-to-arm-hf)
* **11.02.23:** - Rebase to Alpine 3.17.
* **17.10.22:** - Rebase to alpine 3.16, migrate to S6V3

View File

@ -57,6 +57,7 @@ app_setup_block_enabled: false
app_setup_block: []
# changelog
changelogs:
- {date: "10.07.23:", desc: "Rebase to Alpine 3.18."}
- {date: "01.07.23:", desc: "Deprecate armhf. As announced [here](https://www.linuxserver.io/blog/a-farewell-to-arm-hf)"}
- {date: "11.02.23:", desc: "Rebase to Alpine 3.17."}
- {date: "17.10.22:", desc: "Rebase to alpine 3.16, migrate to S6V3"}

View File

@ -1 +1 @@
oneshot
oneshot

View File

@ -3,4 +3,4 @@
exec \
s6-notifyoncheck -d -n 300 -w 1000 -c "nc -z localhost 8000" \
cd /app/apprise-api/apprise_api s6-setuidgid abc /usr/sbin/uwsgi --http-socket=:8000 --enable-threads --plugin=python3 --module=core.wsgi:application --static-map=/s=static --buffer-size=32768
cd /app/apprise-api/apprise_api s6-setuidgid abc /usr/sbin/uwsgi --http-socket=:8000 --enable-threads --plugin=python3 --module=core.wsgi:application --static-map=/s=static --buffer-size=32768 -H /lsiopy

View File

@ -1 +1 @@
longrun
longrun