diff --git a/Dockerfile b/Dockerfile index c0cf79c..325fbec 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 -FROM ghcr.io/linuxserver/baseimage-alpine:3.19 +FROM ghcr.io/linuxserver/baseimage-alpine:3.20 # set version label ARG BUILD_DATE @@ -43,8 +43,9 @@ RUN \ pip install -U --no-cache-dir \ pip \ wheel && \ - pip install -U --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.19/ -r requirements.txt && \ + pip install -U --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.20/ -r requirements.txt && \ pip cache purge && \ + printf "Linuxserver.io version: ${VERSION}\nBuild-date: ${BUILD_DATE}" > /build_version && \ echo "**** cleanup ****" && \ apk del --purge \ build-dependencies && \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 7ee4235..1795675 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 -FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.19 +FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.20 # set version label ARG BUILD_DATE @@ -43,8 +43,9 @@ RUN \ pip install -U --no-cache-dir \ pip \ wheel && \ - pip install -U --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.19/ -r requirements.txt && \ + pip install -U --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.20/ -r requirements.txt && \ pip cache purge && \ + printf "Linuxserver.io version: ${VERSION}\nBuild-date: ${BUILD_DATE}" > /build_version && \ echo "**** cleanup ****" && \ apk del --purge \ build-dependencies && \ diff --git a/Jenkinsfile b/Jenkinsfile index f11d707..2150fa7 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -34,7 +34,7 @@ pipeline { CI_PORT='80' CI_SSL='' CI_DELAY='60' - CI_DOCKERENV='TZ=Europe/London' + CI_DOCKERENV='' CI_AUTH='' CI_WEBPATH='' } diff --git a/README.md b/README.md index 2a913e6..200e280 100644 --- a/README.md +++ b/README.md @@ -298,4 +298,5 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions +* **01.06.24:** - Rebase to Alpine 3.20. * **22.04.24:** - Initial Release. diff --git a/jenkins-vars.yml b/jenkins-vars.yml index 7a084fc..fe91fae 100644 --- a/jenkins-vars.yml +++ b/jenkins-vars.yml @@ -24,7 +24,7 @@ repo_vars: - CI_PORT='80' - CI_SSL='' - CI_DELAY='60' - - CI_DOCKERENV='TZ=Europe/London' + - CI_DOCKERENV='' - CI_AUTH='' - CI_WEBPATH='' sponsor_links: diff --git a/readme-vars.yml b/readme-vars.yml index 74f2b1e..394ec67 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -23,16 +23,9 @@ development_versions_items: # container parameters common_param_env_vars_enabled: true param_container_name: "{{ project_name }}" -param_usage_include_net: false -param_usage_include_env: true -param_env_vars: - - { env_var: "TZ", env_value: "Europe/London", desc: "Specify a timezone to use EG Europe/London." } param_usage_include_vols: true param_volumes: - { vol_path: "/config", vol_host_path: "/path/to/{{ project_name }}/config", desc: "Persistent config files" } -param_usage_include_ports: false -param_device_map: false -cap_add_param: false # optional container parameters opt_param_usage_include_env: true @@ -42,11 +35,6 @@ opt_param_env_vars: - { env_var: "KOMETA_RUN", env_value: "False", desc: "Set to `True` to run without the scheduler." } - { env_var: "KOMETA_TEST", env_value: "False", desc: "Set to `True` to run in debug mode with only collections that have `test: true`." } - { env_var: "KOMETA_NO_MISSING", env_value: "False", desc: "Set to `True` to run without any of the missing movie/show functions." } -opt_param_usage_include_vols: false -opt_param_usage_include_ports: false -opt_param_device_map: false -opt_cap_add_param: false -optional_block_1: false # application setup block app_setup_block_enabled: true @@ -61,4 +49,5 @@ app_setup_block: | # changelog changelogs: + - { date: "01.06.24:", desc: "Rebase to Alpine 3.20." } - { date: "22.04.24:", desc: "Initial Release." }