diff --git a/Dockerfile b/Dockerfile index f18f993..4af3384 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 @@ -44,6 +44,7 @@ RUN \ /tmp/ini.zip -L \ http://www.webgrabplus.com/sites/default/files/download/ini/SiteIniPack_current.zip && \ unzip -q /tmp/ini.zip -d /defaults/ini/ && \ + printf "Linuxserver.io version: ${VERSION}\nBuild-date: ${BUILD_DATE}" > /build_version && \ echo "**** cleanup ****" && \ rm -rf \ /tmp/* diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 8697b60..981fc00 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 @@ -45,6 +45,7 @@ RUN \ /tmp/ini.zip -L \ http://www.webgrabplus.com/sites/default/files/download/ini/SiteIniPack_current.zip && \ unzip -q /tmp/ini.zip -d /defaults/ini/ && \ + printf "Linuxserver.io version: ${VERSION}\nBuild-date: ${BUILD_DATE}" > /build_version && \ echo "**** cleanup ****" && \ rm -rf \ /tmp/* \ diff --git a/Jenkinsfile b/Jenkinsfile index 4904775..b3acd20 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -30,9 +30,9 @@ pipeline { CI_WEB='false' CI_PORT='80' CI_SSL='false' - CI_DELAY='30' - CI_DOCKERENV='TZ=US/Pacific' - CI_AUTH='user:password' + CI_DELAY='120' + CI_DOCKERENV='' + CI_AUTH='' CI_WEBPATH='' } stages { diff --git a/README.md b/README.md index dcd862e..f872b31 100644 --- a/README.md +++ b/README.md @@ -287,6 +287,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions +* **25.06.24:** - Rebase to Alpine 3.20. * **23.04.24:** - Bump dotnet framework to 8.x. * **23.12.23:** - Rebase to Alpine 3.19. * **18.08.23:** - Rebase to Alpine 3.18. diff --git a/jenkins-vars.yml b/jenkins-vars.yml index c08a8e7..646b763 100644 --- a/jenkins-vars.yml +++ b/jenkins-vars.yml @@ -21,7 +21,7 @@ repo_vars: - CI_WEB='false' - CI_PORT='80' - CI_SSL='false' - - CI_DELAY='30' - - CI_DOCKERENV='TZ=US/Pacific' - - CI_AUTH='user:password' + - CI_DELAY='120' + - CI_DOCKERENV='' + - CI_AUTH='' - CI_WEBPATH='' diff --git a/readme-vars.yml b/readme-vars.yml index 5665911..13ad3f5 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -23,13 +23,6 @@ param_usage_include_vols: true param_volumes: - { vol_path: "/config", vol_host_path: "/path/to/{{ project_name }}/config", desc: "Persistent config files" } - {vol_path: "/data", vol_host_path: "/path/to/data", desc: "Where webgrabplus should store it's data files."} -param_usage_include_ports: 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"} -# optional parameters -optional_block_1: false -optional_block_1_items: "" # application setup block app_setup_block_enabled: true app_setup_block: | @@ -47,8 +40,9 @@ app_setup_block: | To adjust the scheduled cron job, you can apply our [universal cron mod](https://github.com/linuxserver/docker-mods/tree/universal-cron). # changelog changelogs: + - {date: "25.06.24:", desc: "Rebase to Alpine 3.20."} - {date: "23.04.24:", desc: "Bump dotnet framework to 8.x."} - - { date: "23.12.23:", desc: "Rebase to Alpine 3.19."} + - {date: "23.12.23:", desc: "Rebase to Alpine 3.19."} - {date: "18.08.23:", desc: "Rebase to Alpine 3.18."} - {date: "16.08.23:", desc: "Update dotnet framework to 7.x."} - {date: "06.07.23:", desc: "Deprecate armhf. As announced [here](https://www.linuxserver.io/blog/a-farewell-to-arm-hf)"}