From 2f33c0e2c749b4672d100bafdaa7deafc2f5ccc2 Mon Sep 17 00:00:00 2001 From: thespad Date: Mon, 8 Jul 2024 17:59:24 +0100 Subject: [PATCH 1/2] Rebase to noble --- Dockerfile | 12 +++++++----- Dockerfile.aarch64 | 12 +++++++----- Jenkinsfile | 4 ++-- README.md | 5 +++-- jenkins-vars.yml | 4 ++-- readme-vars.yml | 13 +++++++------ .../dependencies.d/{init-ombi => init-ombi-config} | 0 .../dependencies.d/init-config | 0 root/etc/s6-overlay/s6-rc.d/init-ombi-config/run | 11 +++++++++++ .../s6-rc.d/{init-ombi => init-ombi-config}/type | 0 root/etc/s6-overlay/s6-rc.d/init-ombi-config/up | 1 + root/etc/s6-overlay/s6-rc.d/init-ombi/run | 6 ------ root/etc/s6-overlay/s6-rc.d/init-ombi/up | 1 - root/etc/s6-overlay/s6-rc.d/svc-ombi/run | 1 + .../s6-overlay/s6-rc.d/user/contents.d/init-ombi | 0 .../init-ombi => user/contents.d/init-ombi-config} | 0 16 files changed, 41 insertions(+), 29 deletions(-) rename root/etc/s6-overlay/s6-rc.d/init-config-end/dependencies.d/{init-ombi => init-ombi-config} (100%) rename root/etc/s6-overlay/s6-rc.d/{init-ombi => init-ombi-config}/dependencies.d/init-config (100%) create mode 100755 root/etc/s6-overlay/s6-rc.d/init-ombi-config/run rename root/etc/s6-overlay/s6-rc.d/{init-ombi => init-ombi-config}/type (100%) create mode 100644 root/etc/s6-overlay/s6-rc.d/init-ombi-config/up delete mode 100755 root/etc/s6-overlay/s6-rc.d/init-ombi/run delete mode 100644 root/etc/s6-overlay/s6-rc.d/init-ombi/up delete mode 100644 root/etc/s6-overlay/s6-rc.d/user/contents.d/init-ombi rename root/etc/s6-overlay/s6-rc.d/{svc-ombi/dependencies.d/init-ombi => user/contents.d/init-ombi-config} (100%) diff --git a/Dockerfile b/Dockerfile index 08a4dd33b..f76555581 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM ghcr.io/linuxserver/baseimage-ubuntu:jammy +FROM ghcr.io/linuxserver/baseimage-ubuntu:noble # set version label ARG BUILD_DATE @@ -8,14 +8,15 @@ LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DA LABEL maintainer="aptalca" # environment settings -ENV HOME="/config" -ENV DEBIAN_FRONTEND="noninteractive" +ENV HOME="/config" \ + COMPlus_EnableDiagnostics=0 \ + DEBIAN_FRONTEND="noninteractive" \ + TMPDIR=/run/ombi-temp RUN \ apt-get update && \ apt-get install -y \ - libicu70 \ - netcat && \ + libicu74 && \ echo "**** install ombi ****" && \ mkdir -p \ /app/ombi && \ @@ -29,6 +30,7 @@ RUN \ tar xzf /tmp/ombi-src.tar.gz -C \ /app/ombi/ && \ chmod +x /app/ombi/Ombi && \ + printf "Linuxserver.io version: ${VERSION}\nBuild-date: ${BUILD_DATE}" > /build_version && \ echo "**** clean up ****" && \ rm -rf \ /tmp/* \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index ef057c234..a984e25e7 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -1,4 +1,4 @@ -FROM ghcr.io/linuxserver/baseimage-ubuntu:arm64v8-jammy +FROM ghcr.io/linuxserver/baseimage-ubuntu:arm64v8-noble # set version label ARG BUILD_DATE @@ -8,14 +8,15 @@ LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DA LABEL maintainer="aptalca" # environment settings -ENV HOME="/config" -ENV DEBIAN_FRONTEND="noninteractive" +ENV HOME="/config" \ + COMPlus_EnableDiagnostics=0 \ + DEBIAN_FRONTEND="noninteractive" \ + TMPDIR=/run/ombi-temp RUN \ apt-get update && \ apt-get install -y \ - libicu70 \ - netcat && \ + libicu74 && \ echo "**** install ombi ****" && \ mkdir -p \ /app/ombi && \ @@ -29,6 +30,7 @@ RUN \ tar xzf /tmp/ombi-src.tar.gz -C \ /app/ombi/ && \ chmod +x /app/ombi/Ombi && \ + printf "Linuxserver.io version: ${VERSION}\nBuild-date: ${BUILD_DATE}" > /build_version && \ echo "**** clean up ****" && \ rm -rf \ /tmp/* \ diff --git a/Jenkinsfile b/Jenkinsfile index 904b7f2a3..5d16c14fa 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -34,8 +34,8 @@ pipeline { CI_PORT='3579' CI_SSL='false' CI_DELAY='120' - CI_DOCKERENV='TZ=US/Pacific' - CI_AUTH='user:password' + CI_DOCKERENV='' + CI_AUTH='' CI_WEBPATH='' } stages { diff --git a/README.md b/README.md index 0ef517a34..f19224372 100644 --- a/README.md +++ b/README.md @@ -92,7 +92,7 @@ services: - TZ=Etc/UTC - BASE_URL=/ombi #optional volumes: - - /path/to/appdata/config:/config + - /path/to/ombi/config:/config ports: - 3579:3579 restart: unless-stopped @@ -108,7 +108,7 @@ docker run -d \ -e TZ=Etc/UTC \ -e BASE_URL=/ombi `#optional` \ -p 3579:3579 \ - -v /path/to/appdata/config:/config \ + -v /path/to/ombi/config:/config \ --restart unless-stopped \ lscr.io/linuxserver/ombi:latest ``` @@ -287,6 +287,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions +* **08.07.24:** - Rebase to Ubuntu Noble. * **01.07.23:** - Deprecate armhf. As announced [here](https://www.linuxserver.io/blog/a-farewell-to-arm-hf) * **11.09.22:** - Migrate to s6v3. * **01.05.22:** - Rebase to Jammy. diff --git a/jenkins-vars.yml b/jenkins-vars.yml index 3dfa45850..7be4e9b0e 100644 --- a/jenkins-vars.yml +++ b/jenkins-vars.yml @@ -24,8 +24,8 @@ repo_vars: - CI_PORT='3579' - CI_SSL='false' - CI_DELAY='120' - - CI_DOCKERENV='TZ=US/Pacific' - - CI_AUTH='user:password' + - CI_DOCKERENV='' + - CI_AUTH='' - CI_WEBPATH='' sponsor_links: - { name: "Ombi - Patreon", url: "https://patreon.com/tidusjar" } diff --git a/readme-vars.yml b/readme-vars.yml index ba22376fc..13b3c6552 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -20,25 +20,26 @@ common_param_env_vars_enabled: true param_container_name: "{{ project_name }}" param_usage_include_vols: true param_volumes: - - {vol_path: "/config", vol_host_path: "/path/to/appdata/config", desc: "Contains all relevant configuration files."} + - {vol_path: "/config", vol_host_path: "/path/to/{{ project_name }}/config", desc: "Contains all relevant configuration files."} param_usage_include_ports: true param_ports: - {external_port: "3579", internal_port: "3579", port_desc: "web gui"} -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 container parameters opt_param_usage_include_env: true opt_param_env_vars: - {env_var: "BASE_URL", env_value: "/ombi", desc: "Subfolder can optionally be defined as an env variable for reverse proxies. Keep in mind that once this value is defined, the gui setting for base url no longer works. To use the gui setting, remove this env variable."} -optional_block_1: false -optional_block_1_items: "" + +readonly_supported: true +readonly_message: | + * `BASE_URL` cannot be changed from `/` + # application setup block app_setup_block_enabled: true app_setup_block: | Access the webui at `:3579`. Follow the setup wizard on initial install. Then configure the required services. # changelog changelogs: + - {date: "08.07.24:", desc: "Rebase to Ubuntu Noble."} - {date: "01.07.23:", desc: "Deprecate armhf. As announced [here](https://www.linuxserver.io/blog/a-farewell-to-arm-hf)"} - {date: "11.09.22:", desc: "Migrate to s6v3."} - {date: "01.05.22:", desc: "Rebase to Jammy."} diff --git a/root/etc/s6-overlay/s6-rc.d/init-config-end/dependencies.d/init-ombi b/root/etc/s6-overlay/s6-rc.d/init-config-end/dependencies.d/init-ombi-config similarity index 100% rename from root/etc/s6-overlay/s6-rc.d/init-config-end/dependencies.d/init-ombi rename to root/etc/s6-overlay/s6-rc.d/init-config-end/dependencies.d/init-ombi-config diff --git a/root/etc/s6-overlay/s6-rc.d/init-ombi/dependencies.d/init-config b/root/etc/s6-overlay/s6-rc.d/init-ombi-config/dependencies.d/init-config similarity index 100% rename from root/etc/s6-overlay/s6-rc.d/init-ombi/dependencies.d/init-config rename to root/etc/s6-overlay/s6-rc.d/init-ombi-config/dependencies.d/init-config diff --git a/root/etc/s6-overlay/s6-rc.d/init-ombi-config/run b/root/etc/s6-overlay/s6-rc.d/init-ombi-config/run new file mode 100755 index 000000000..e8d82c3f0 --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/init-ombi-config/run @@ -0,0 +1,11 @@ +#!/usr/bin/with-contenv bash +# shellcheck shell=bash + +mkdir -p /run/ombi-temp + +# permissions +lsiown -R abc:abc \ + /run/ombi-temp \ + /config + +lsiown abc:abc /app/ombi/ClientApp/dist/index.html > /dev/null 2>&1 diff --git a/root/etc/s6-overlay/s6-rc.d/init-ombi/type b/root/etc/s6-overlay/s6-rc.d/init-ombi-config/type similarity index 100% rename from root/etc/s6-overlay/s6-rc.d/init-ombi/type rename to root/etc/s6-overlay/s6-rc.d/init-ombi-config/type diff --git a/root/etc/s6-overlay/s6-rc.d/init-ombi-config/up b/root/etc/s6-overlay/s6-rc.d/init-ombi-config/up new file mode 100644 index 000000000..4c5aac608 --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/init-ombi-config/up @@ -0,0 +1 @@ +/etc/s6-overlay/s6-rc.d/init-ombi-config/run diff --git a/root/etc/s6-overlay/s6-rc.d/init-ombi/run b/root/etc/s6-overlay/s6-rc.d/init-ombi/run deleted file mode 100755 index 1d1a5905f..000000000 --- a/root/etc/s6-overlay/s6-rc.d/init-ombi/run +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/with-contenv bash - -# permissions -chown -R abc:abc \ - /app/ombi \ - /config diff --git a/root/etc/s6-overlay/s6-rc.d/init-ombi/up b/root/etc/s6-overlay/s6-rc.d/init-ombi/up deleted file mode 100644 index 00cdcb12a..000000000 --- a/root/etc/s6-overlay/s6-rc.d/init-ombi/up +++ /dev/null @@ -1 +0,0 @@ -/etc/s6-overlay/s6-rc.d/init-ombi/run diff --git a/root/etc/s6-overlay/s6-rc.d/svc-ombi/run b/root/etc/s6-overlay/s6-rc.d/svc-ombi/run index b0414ac26..fc6cc0de3 100755 --- a/root/etc/s6-overlay/s6-rc.d/svc-ombi/run +++ b/root/etc/s6-overlay/s6-rc.d/svc-ombi/run @@ -1,4 +1,5 @@ #!/usr/bin/with-contenv bash +# shellcheck shell=bash if [[ -n "${BASE_URL}" ]]; then EXTRA_PARAM="--baseurl ${BASE_URL}" diff --git a/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-ombi b/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-ombi deleted file mode 100644 index e69de29bb..000000000 diff --git a/root/etc/s6-overlay/s6-rc.d/svc-ombi/dependencies.d/init-ombi b/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-ombi-config similarity index 100% rename from root/etc/s6-overlay/s6-rc.d/svc-ombi/dependencies.d/init-ombi rename to root/etc/s6-overlay/s6-rc.d/user/contents.d/init-ombi-config From 969b54a408b954056c4c63ed384eca187e94686c Mon Sep 17 00:00:00 2001 From: thespad Date: Mon, 8 Jul 2024 18:04:44 +0100 Subject: [PATCH 2/2] Fix default --- README.md | 6 +++--- readme-vars.yml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index f19224372..2d71b0f95 100644 --- a/README.md +++ b/README.md @@ -90,7 +90,7 @@ services: - PUID=1000 - PGID=1000 - TZ=Etc/UTC - - BASE_URL=/ombi #optional + - BASE_URL=/ #optional volumes: - /path/to/ombi/config:/config ports: @@ -106,7 +106,7 @@ docker run -d \ -e PUID=1000 \ -e PGID=1000 \ -e TZ=Etc/UTC \ - -e BASE_URL=/ombi `#optional` \ + -e BASE_URL=/ `#optional` \ -p 3579:3579 \ -v /path/to/ombi/config:/config \ --restart unless-stopped \ @@ -123,7 +123,7 @@ Containers are configured using parameters passed at runtime (such as those abov | `-e PUID=1000` | for UserID - see below for explanation | | `-e PGID=1000` | for GroupID - see below for explanation | | `-e TZ=Etc/UTC` | specify a timezone to use, see this [list](https://en.wikipedia.org/wiki/List_of_tz_database_time_zones#List). | -| `-e BASE_URL=/ombi` | Subfolder can optionally be defined as an env variable for reverse proxies. Keep in mind that once this value is defined, the gui setting for base url no longer works. To use the gui setting, remove this env variable. | +| `-e BASE_URL=/` | Subfolder can optionally be defined as an env variable for reverse proxies. Keep in mind that once this value is defined, the gui setting for base url no longer works. To use the gui setting, remove this env variable. | | `-v /config` | Contains all relevant configuration files. | ## Environment variables from files (Docker secrets) diff --git a/readme-vars.yml b/readme-vars.yml index 13b3c6552..a7bb4ee58 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -27,7 +27,7 @@ param_ports: # optional container parameters opt_param_usage_include_env: true opt_param_env_vars: - - {env_var: "BASE_URL", env_value: "/ombi", desc: "Subfolder can optionally be defined as an env variable for reverse proxies. Keep in mind that once this value is defined, the gui setting for base url no longer works. To use the gui setting, remove this env variable."} + - {env_var: "BASE_URL", env_value: "/", desc: "Subfolder can optionally be defined as an env variable for reverse proxies. Keep in mind that once this value is defined, the gui setting for base url no longer works. To use the gui setting, remove this env variable."} readonly_supported: true readonly_message: |