diff --git a/Dockerfile b/Dockerfile index 843750d..6f5491a 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 @@ -24,6 +24,7 @@ RUN \ chmod +x /app/doplarr/bin/doplarr.jar && \ apk add --no-cache \ openjdk17-jre-headless && \ + 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 6425d71..272d0d5 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 @@ -24,6 +24,7 @@ RUN \ chmod +x /app/doplarr/bin/doplarr.jar && \ apk add --no-cache \ openjdk17-jre-headless && \ + printf "Linuxserver.io version: ${VERSION}\nBuild-date: ${BUILD_DATE}" > /build_version && \ echo "**** cleanup ****" && \ rm -rf \ /tmp/* \ diff --git a/Jenkinsfile b/Jenkinsfile index ca0ae5b..1fa8b9d 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -28,7 +28,6 @@ pipeline { DEV_DOCKERHUB_IMAGE = 'lsiodev/doplarr' PR_DOCKERHUB_IMAGE = 'lspipepr/doplarr' DIST_IMAGE = 'alpine' - DIST_TAG = '3.19' MULTIARCH='true' CI='true' CI_WEB='false' @@ -36,7 +35,7 @@ pipeline { CI_SSL='false' CI_DELAY='120' CI_DOCKERENV='TEST_RUN=1' - CI_AUTH='user:password' + CI_AUTH='' CI_WEBPATH='' } stages { diff --git a/README.md b/README.md index 9bb647e..7eeb04d 100644 --- a/README.md +++ b/README.md @@ -330,6 +330,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. * **25.05.23:** - Rebase to Alpine 3.18. * **18.12.22:** - Rebase to alpine 3.17, upgrade to openjdk17. diff --git a/jenkins-vars.yml b/jenkins-vars.yml index ba52a86..b986518 100644 --- a/jenkins-vars.yml +++ b/jenkins-vars.yml @@ -6,7 +6,6 @@ external_type: github_stable release_type: stable release_tag: latest ls_branch: main -build_armhf: false repo_vars: - EXT_GIT_BRANCH = 'master' - EXT_USER = 'kiranshila' @@ -19,7 +18,6 @@ repo_vars: - DEV_DOCKERHUB_IMAGE = 'lsiodev/doplarr' - PR_DOCKERHUB_IMAGE = 'lspipepr/doplarr' - DIST_IMAGE = 'alpine' - - DIST_TAG = '3.19' - MULTIARCH='true' - CI='true' - CI_WEB='false' @@ -27,7 +25,7 @@ repo_vars: - CI_SSL='false' - CI_DELAY='120' - CI_DOCKERENV='TEST_RUN=1' - - CI_AUTH='user:password' + - CI_AUTH='' - CI_WEBPATH='' sponsor_links: - { name: "kiranshila", url: "https://github.com/sponsors/kiranshila" } diff --git a/readme-vars.yml b/readme-vars.yml index 5d1dbe7..fcd0eb1 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -8,24 +8,17 @@ project_blurb: | [{{ project_name|capitalize }}]({{ project_url }}) is an *arr request bot for Discord." project_lsio_github_repo_url: "https://github.com/linuxserver/docker-{{ project_name }}" -project_blurb_optional_extras_enabled: false # 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: - - { tag: "latest", desc: "Stable releases" } - # container parameters common_param_env_vars_enabled: true param_container_name: "{{ project_name }}" param_usage_include_env: true param_env_vars: - - { env_var: "TZ", env_value: "America/New_York", desc: "Specify a timezone to use EG America/New_York" } - { env_var: "DISCORD__TOKEN", env_value: "", desc: "Specify your discord bot token." } - { env_var: "OVERSEERR__API", env_value: "", desc: "Specify your Overseerr API key. Leave blank if using Radarr/Sonarr." } - { env_var: "OVERSEERR__URL", env_value: "http://localhost:5055", desc: "Specify your Overseerr URL. Leave blank if using Radarr/Sonarr." } @@ -36,9 +29,6 @@ param_env_vars: 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 @@ -55,12 +45,6 @@ opt_param_env_vars: - { env_var: "LOG_LEVEL", env_value: ":info", desc: "The log level for the logging backend. This can be changed for debugging purposes. One of trace `:debug` `:info` `:warn` `:error` `:fatal` `:report`" } - { env_var: "JAVA_OPTS", env_value: "", desc: "For passing additional java options." } -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 app_setup_block: | @@ -77,6 +61,7 @@ app_setup_block: | # changelog changelogs: + - { date: "24.06.24:", desc: "Rebase to Alpine 3.20."} - { date: "23.12.23:", desc: "Rebase to Alpine 3.19."} - { date: "25.05.23:", desc: "Rebase to Alpine 3.18." } - { date: "18.12.22:", desc: "Rebase to alpine 3.17, upgrade to openjdk17." }