From 837c626d5747eb8f59fd5b0fb4bc5c5824c4d853 Mon Sep 17 00:00:00 2001 From: thespad Date: Thu, 6 Jun 2024 17:44:10 +0100 Subject: [PATCH] Rebase to 3.20 --- Dockerfile | 5 +++-- Dockerfile.aarch64 | 5 +++-- Jenkinsfile | 4 ++-- README.md | 6 +----- jenkins-vars.yml | 4 ++-- readme-vars.yml | 16 +++------------- 6 files changed, 14 insertions(+), 26 deletions(-) diff --git a/Dockerfile b/Dockerfile index e71de9b..2286e53 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 32bb1da..0965cdd 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 9d6d804..476fbc9 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 52bb604..a414f3e 100644 --- a/README.md +++ b/README.md @@ -99,11 +99,6 @@ docker run -d \ lscr.io/linuxserver/bazarr:development ``` -You can choose between ,using tags, various branch versions of bazarr, no tag is required to remain on the main branch. -Add one of the tags, if required, to the linuxserver/bazarr line of the run/create command in the following format, linuxserver/bazarr:development -The development tag will be the latest commit in the development branch of bazarr. - - ## Parameters Containers are configured using parameters passed at runtime (such as those above). These parameters are separated by a colon and indicate `:` respectively. For example, `-p 8080:80` would expose port `80` from inside the container to be accessible from the host's IP on port `8080` outside the container. @@ -277,6 +272,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions +* **01.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). * **10.08.23:** - Bump unrar to 6.2.10. diff --git a/jenkins-vars.yml b/jenkins-vars.yml index 668af67..fb1ab59 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 a24f57b..449725e 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -10,13 +10,7 @@ project_lsio_github_repo_url: "https://github.com/linuxserver/docker-{{ project_ available_architectures: - {arch: "{{ arch_x86_64 }}", tag: "amd64-latest"} - {arch: "{{ arch_arm64 }}", tag: "arm64v8-latest"} -# Optional Block -optional_block_1: true -optional_block_1_items: - - | - You can choose between ,using tags, various branch versions of bazarr, no tag is required to remain on the main branch. - Add one of the tags, if required, to the linuxserver/bazarr line of the run/create command in the following format, linuxserver/bazarr:development - The development tag will be the latest commit in the development branch of bazarr. + # container parameters param_container_name: "{{ project_name }}" param_usage_include_vols: true @@ -25,11 +19,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 # application setup block app_setup_block_enabled: true app_setup_block: | @@ -37,7 +26,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: "06.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: "10.08.23:", desc: "Bump unrar to 6.2.10."} - {date: "11.07.23:", desc: "Rebase to Alpine 3.18"}