Merge pull request #8 from linuxserver/3.17

This commit is contained in:
Adam 2023-02-13 09:06:02 +00:00 committed by GitHub
commit f6bc6fb443
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 35 additions and 23 deletions

0
.github/workflows/call_invalid_helper.yml vendored Executable file → Normal file
View File

0
.github/workflows/permissions.yml vendored Executable file → Normal file
View File

View File

@ -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

View File

@ -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 && \

View File

@ -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 && \

View File

@ -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.

View File

@ -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." }

View File

@ -2,5 +2,5 @@
# shellcheck shell=bash
# permissions
chown -R abc:abc \
/config
lsiown -R abc:abc \
/config

View File

@ -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" \