Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rebase to 3.21, update CI envs #124

Merged
merged 4 commits into from
Dec 20, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# syntax=docker/dockerfile:1

FROM ghcr.io/linuxserver/baseimage-alpine:3.20
FROM ghcr.io/linuxserver/baseimage-alpine:3.21

# set version label
ARG BUILD_DATE
Expand Down Expand Up @@ -51,11 +51,11 @@ RUN \
pip install -U --no-cache-dir \
pip \
wheel && \
pip install -U --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.20/ \
pip install -U --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.21/ \
apprise \
minio \
mysqlclient && \
pip install -U --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.20/ -r requirements.txt && \
pip install -U --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.21/ -r requirements.txt && \
cd /app/healthchecks && \
DEBUG=False python3 ./manage.py collectstatic --noinput && \
DEBUG=False python3 ./manage.py compress && \
Expand Down
6 changes: 3 additions & 3 deletions Dockerfile.aarch64
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# syntax=docker/dockerfile:1

FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.20
FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.21

# set version label
ARG BUILD_DATE
Expand Down Expand Up @@ -51,11 +51,11 @@ RUN \
pip install -U --no-cache-dir \
pip \
wheel && \
pip install -U --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.20/ \
pip install -U --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.21/ \
apprise \
minio \
mysqlclient && \
pip install -U --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.20/ -r requirements.txt && \
pip install -U --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.21/ -r requirements.txt && \
cd /app/healthchecks && \
DEBUG=False python3 ./manage.py collectstatic --noinput && \
DEBUG=False python3 ./manage.py compress && \
Expand Down
2 changes: 1 addition & 1 deletion Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ pipeline {
CI_PORT='8000'
CI_SSL='false'
CI_DELAY='120'
CI_DOCKERENV='SITE_ROOT=http://*'
CI_DOCKERENV='SITE_ROOT=http://*|ALLOWED_HOSTS=*'
CI_AUTH=''
CI_WEBPATH=''
}
Expand Down
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -337,6 +337,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64

## Versions

* **20.12.24:** - Rebase to Alpine 3.21.
* **31.08.24:** - Enable IPv6 on uwsgi.
* **31.05.24:** - Rebase to Alpine 3.20.
* **24.01.24:** - No longer write envs to local_settings.py. Envs will take precedence over any existing values in config file. Removed `REGENERATE_SETTINGS` as it is now obsolete.
Expand Down
2 changes: 1 addition & 1 deletion jenkins-vars.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,6 @@ repo_vars:
- CI_PORT='8000'
- CI_SSL='false'
- CI_DELAY='120'
- CI_DOCKERENV='SITE_ROOT=http://*'
- CI_DOCKERENV='SITE_ROOT=http://*|ALLOWED_HOSTS=*'
- CI_AUTH=''
- CI_WEBPATH=''
1 change: 1 addition & 0 deletions readme-vars.yml
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,7 @@ init_diagram: |
"healthchecks:latest" <- Base Images
# changelog
changelogs:
- {date: "20.12.24:", desc: "Rebase to Alpine 3.21."}
- {date: "31.08.24:", desc: "Enable IPv6 on uwsgi."}
- {date: "31.05.24:", desc: "Rebase to Alpine 3.20."}
- {date: "24.01.24:", desc: "No longer write envs to local_settings.py. Envs will take precedence over any existing values in config file. Removed `REGENERATE_SETTINGS` as it is now obsolete."}
Expand Down
2 changes: 1 addition & 1 deletion root/etc/s6-overlay/s6-rc.d/svc-healthchecks/run
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@

exec \
s6-notifyoncheck -d -n 300 -w 1000 -c "nc -z localhost 8000" \
cd /app/healthchecks s6-setuidgid abc /usr/sbin/uwsgi --ini uwsgi.ini
cd /app/healthchecks s6-setuidgid abc /usr/sbin/uwsgi --ini uwsgi.ini
Loading