From 0201c06b876c8b689e070bc190a38adfd7e0cd90 Mon Sep 17 00:00:00 2001 From: thespad Date: Thu, 6 Jun 2024 14:23:32 +0100 Subject: [PATCH] Rebase to 3.20 --- Dockerfile | 3 ++- Dockerfile.aarch64 | 3 ++- Jenkinsfile | 4 ++-- README.md | 4 +--- jenkins-vars.yml | 4 ++-- readme-vars.yml | 10 +++------- root/etc/s6-overlay/s6-rc.d/svc-ubooquity/run | 3 ++- 7 files changed, 14 insertions(+), 17 deletions(-) diff --git a/Dockerfile b/Dockerfile index 7a177c8..165f0da 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 @@ -27,6 +27,7 @@ RUN \ /tmp/ubooquity.zip -L \ "https://vaemendis.net/ubooquity/downloads/Ubooquity-${UBOOQUITY_VERSION}.zip" && \ unzip /tmp/ubooquity.zip -d /app/ubooquity && \ + 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 fbb56f5..9695fbb 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 @@ -27,6 +27,7 @@ RUN \ /tmp/ubooquity.zip -L \ "https://vaemendis.net/ubooquity/downloads/Ubooquity-${UBOOQUITY_VERSION}.zip" && \ unzip /tmp/ubooquity.zip -d /app/ubooquity && \ + 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 a87244e..d98983a 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -31,8 +31,8 @@ pipeline { CI_PORT='2203' CI_SSL='false' CI_DELAY='120' - CI_DOCKERENV='TZ=US/Pacific' - CI_AUTH='user:password' + CI_DOCKERENV='' + CI_AUTH='' CI_WEBPATH='/ubooquity/admin' } stages { diff --git a/README.md b/README.md index 7e0518d..f09ac0f 100644 --- a/README.md +++ b/README.md @@ -59,9 +59,6 @@ The architectures supported by this image are: ## Application Setup -**IMPORTANT** -Ubooquity has now been upgraded to [version 2](http://vaemendis.net/ubooquity/article19/ubooquity-2-1-0) and for existing v1.x users we recommend cleaning your appdata and reinstalling, due to changes in the application itself making the two versions essentially incompatible with each other. Also the admin page and library pages are now on separate ports as detailed below. - Access the admin page at `http://:2203/ubooquity/admin` and set a password. Then you can access the webui at `http://:2202/ubooquity/` @@ -301,6 +298,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions +* **06.06.24:** - Rebase to Alpine 3.20. * **20.03.24:** - Rebase to Alpine 3.19. * **29.10.23:** - Bump JRE to 17 to support v3. * **12.07.23:** - Rebase to Alpine 3.18. diff --git a/jenkins-vars.yml b/jenkins-vars.yml index 891b176..676d733 100644 --- a/jenkins-vars.yml +++ b/jenkins-vars.yml @@ -22,6 +22,6 @@ repo_vars: - CI_PORT='2203' - CI_SSL='false' - CI_DELAY='120' - - CI_DOCKERENV='TZ=US/Pacific' - - CI_AUTH='user:password' + - CI_DOCKERENV='' + - CI_AUTH='' - CI_WEBPATH='/ubooquity/admin' diff --git a/readme-vars.yml b/readme-vars.yml index 886383e..3a35e49 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -6,17 +6,15 @@ project_url: "https://vaemendis.net/ubooquity/" project_logo: "https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/ubooquity-banner.png" project_blurb: "[{{ project_name|capitalize }}]({{ project_url }}) is a free, lightweight and easy-to-use home server for your comics and ebooks. Use it to access your files from anywhere, with a tablet, an e-reader, a phone or a computer." 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 + # container parameters common_param_env_vars_enabled: true param_container_name: "{{ project_name }}" -param_usage_include_net: false opt_param_usage_include_env: true opt_param_env_vars: - {env_var: "MAXMEM", env_value: "", desc: "To set the maximum memory. ( ex: set '1024' for 1GB )"} @@ -34,9 +32,6 @@ param_ports: # application setup block app_setup_block_enabled: true app_setup_block: | - **IMPORTANT** - Ubooquity has now been upgraded to [version 2](http://vaemendis.net/ubooquity/article19/ubooquity-2-1-0) and for existing v1.x users we recommend cleaning your appdata and reinstalling, due to changes in the application itself making the two versions essentially incompatible with each other. Also the admin page and library pages are now on separate ports as detailed below. - Access the admin page at `http://:2203/ubooquity/admin` and set a password. Then you can access the webui at `http://:2202/ubooquity/` @@ -52,6 +47,7 @@ app_setup_block: | If no value is set it will default to 512MB. # changelog changelogs: + - {date: "06.06.24:", desc: "Rebase to Alpine 3.20."} - {date: "20.03.24:", desc: "Rebase to Alpine 3.19."} - {date: "29.10.23:", desc: "Bump JRE to 17 to support v3."} - {date: "12.07.23:", desc: "Rebase to Alpine 3.18."} diff --git a/root/etc/s6-overlay/s6-rc.d/svc-ubooquity/run b/root/etc/s6-overlay/s6-rc.d/svc-ubooquity/run index 9568874..0524a04 100755 --- a/root/etc/s6-overlay/s6-rc.d/svc-ubooquity/run +++ b/root/etc/s6-overlay/s6-rc.d/svc-ubooquity/run @@ -2,9 +2,10 @@ # shellcheck shell=bash JAVAMEM=${MAXMEM:-512} +PORT=$(jq -r '.adminPortNumber' < /config/preferences.json) exec \ - s6-notifyoncheck -d -n 300 -w 1000 -c "nc -z localhost 2203" \ + s6-notifyoncheck -d -n 300 -w 1000 -c "nc -z localhost ${PORT:-2203}" \ cd /app/ubooquity s6-setuidgid abc java -Xmx"$JAVAMEM"m \ -jar /app/ubooquity/Ubooquity.jar \ --headless --host 0.0.0.0 --remoteadmin \