From 8778432ccbebee10f0844c9b3df68db645d0f3d0 Mon Sep 17 00:00:00 2001 From: thespad Date: Mon, 24 Jun 2024 18:57:00 +0100 Subject: [PATCH] Rebase to 3.20 --- Dockerfile | 5 +++-- Dockerfile.aarch64 | 5 +++-- Jenkinsfile | 4 ++-- README.md | 1 + jenkins-vars.yml | 4 ++-- readme-vars.yml | 34 +++------------------------------- 6 files changed, 14 insertions(+), 39 deletions(-) diff --git a/Dockerfile b/Dockerfile index b6ea259..3a41ec7 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 @@ -41,7 +41,8 @@ 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 && \ + 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 63d9825..8926fb6 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 @@ -41,7 +41,8 @@ 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 && \ + 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 f2908a7..19268cd 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -33,8 +33,8 @@ pipeline { CI_PORT='8000' CI_SSL='false' CI_DELAY='120' - CI_DOCKERENV='TZ=US/Pacific' - CI_AUTH='user:password' + CI_DOCKERENV='' + CI_AUTH='' CI_WEBPATH='' } stages { diff --git a/README.md b/README.md index 8d2ab5f..8059f4b 100644 --- a/README.md +++ b/README.md @@ -273,6 +273,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions +* **24.06.24:** - Rebase to Alpine 3.20. * **23.12.23:** - Rebase to Alpine 3.19. * **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) diff --git a/jenkins-vars.yml b/jenkins-vars.yml index 075b475..4e661da 100644 --- a/jenkins-vars.yml +++ b/jenkins-vars.yml @@ -22,8 +22,8 @@ repo_vars: - CI_PORT='8000' - CI_SSL='false' - CI_DELAY='120' - - CI_DOCKERENV='TZ=US/Pacific' - - CI_AUTH='user:password' + - CI_DOCKERENV='' + - CI_AUTH='' - CI_WEBPATH='' sponsor_links: diff --git a/readme-vars.yml b/readme-vars.yml index b07c03e..7956c31 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -12,52 +12,24 @@ project_blurb: | Apprise API was designed to easily fit into existing (and new) eco-systems that are looking for a simple notification solution. project_lsio_github_repo_url: "https://github.com/linuxserver/docker-{{ project_name }}" -project_blurb_optional_extras_enabled: false -project_blurb_optional_extras: [] # supported architectures available_architectures: - {arch: "{{ arch_x86_64 }}", tag: "amd64-latest"} - {arch: "{{ arch_arm64 }}", tag: "arm64v8-latest"} -# development version -development_versions: false -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_device_map: false -param_devices: [] param_usage_include_ports: true param_ports: - {external_port: "8000", internal_port: "8000", port_desc: "Port for apprise's interface and API."} -# optional container parameters -opt_param_usage_include_env: false -opt_param_env_vars: [] -opt_param_usage_include_vols: false -opt_param_volumes: [] -opt_param_usage_include_ports: false -opt_param_ports: [] -opt_param_device_map: false -opt_param_devices: [] -cap_add_param: false -cap_add_param_vars: [] -opt_cap_add_param: false -opt_cap_add_param_vars: [] -optional_block_1: false -optional_block_1_items: "" -privileged: false -# application setup block -app_setup_block_enabled: false -app_setup_block: [] + # changelog changelogs: - - { date: "23.12.23:", desc: "Rebase to Alpine 3.19."} + - {date: "24.06.24:", desc: "Rebase to Alpine 3.20."} + - {date: "23.12.23:", desc: "Rebase to Alpine 3.19."} - {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."}