diff --git a/Dockerfile b/Dockerfile index b54ad9d..96c7910 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ FROM ghcr.io/linuxserver/unrar:latest as unrar -FROM ghcr.io/linuxserver/baseimage-alpine:3.19 +FROM ghcr.io/linuxserver/baseimage-alpine:3.20 # set version label ARG BUILD_DATE @@ -53,9 +53,10 @@ 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/ \ + pip install -U --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.20/ \ -r /app/bazarr/bin/requirements.txt \ -r /app/bazarr/bin/postgres-requirements.txt && \ + printf "Linuxserver.io version: ${VERSION}\nBuild-date: ${BUILD_DATE}" > /build_version && \ echo "**** clean up ****" && \ apk del --purge \ build-dependencies && \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 118d24a..cc4992e 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -2,7 +2,7 @@ FROM ghcr.io/linuxserver/unrar:arm64v8-latest as unrar -FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.19 +FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.20 # set version label ARG BUILD_DATE @@ -53,9 +53,10 @@ 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/ \ + pip install -U --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.20/ \ -r /app/bazarr/bin/requirements.txt \ -r /app/bazarr/bin/postgres-requirements.txt && \ + printf "Linuxserver.io version: ${VERSION}\nBuild-date: ${BUILD_DATE}" > /build_version && \ echo "**** clean up ****" && \ apk del --purge \ build-dependencies && \ diff --git a/Jenkinsfile b/Jenkinsfile index 7673f0b..df9bf84 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -34,8 +34,8 @@ pipeline { CI_PORT='6767' CI_SSL='false' CI_DELAY='120' - CI_DOCKERENV='TZ=US/Pacific' - CI_AUTH='user:password' + CI_DOCKERENV='' + CI_AUTH='' CI_WEBPATH='/system/status' } stages { diff --git a/README.md b/README.md index b996a32..6cc9793 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 +* **24.06.24:** - Rebase to Alpine 3.20. * **23.12.23:** - Rebase to Alpine 3.19. * **19.09.23:** - Install unrar from [linuxserver repo](https://github.com/linuxserver/docker-unrar). * **11.08.23:** - Rebase to Alpine 3.18. diff --git a/jenkins-vars.yml b/jenkins-vars.yml index 8823ec4..194dc39 100644 --- a/jenkins-vars.yml +++ b/jenkins-vars.yml @@ -24,8 +24,8 @@ repo_vars: - CI_PORT='6767' - CI_SSL='false' - CI_DELAY='120' - - CI_DOCKERENV='TZ=US/Pacific' - - CI_AUTH='user:password' + - CI_DOCKERENV='' + - CI_AUTH='' - CI_WEBPATH='/system/status' sponsor_links: - { name: "Bazarr", url: "https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=XHHRWXT9YB7WE&source=url" } diff --git a/readme-vars.yml b/readme-vars.yml index bbf9664..e24e40d 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -22,11 +22,6 @@ param_volumes: param_usage_include_ports: true param_ports: - {external_port: "6767", internal_port: "6767", port_desc: "Allows HTTP access to the internal webserver."} -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 env variables -opt_param_usage_include_env: false opt_param_usage_include_vols: true opt_param_volumes: - {vol_path: "/movies", vol_host_path: "/path/to/movies", desc: "Location of your movies"} @@ -38,7 +33,8 @@ app_setup_block: | - You must complete all the setup parameters in the webui before you can save the config. # 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: "19.09.23:", desc: "Install unrar from [linuxserver repo](https://github.com/linuxserver/docker-unrar)."} - {date: "11.08.23:", desc: "Rebase to Alpine 3.18."} - {date: "10.08.23:", desc: "Bump unrar to 6.2.10."}