Merge pull request #114 from linuxserver/master-noble

Rebase to noble (master)

Author: thespad

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/* \

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/* \

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 {

README.md

@@ -90,9 +90,9 @@ services:
       - PUID=1000
       - PGID=1000
       - TZ=Etc/UTC
-      - BASE_URL=/ombi #optional
+      - BASE_URL=/ #optional
     volumes:
-      - /path/to/appdata/config:/config
+      - /path/to/ombi/config:/config
     ports:
       - 3579:3579
     restart: unless-stopped
@@ -106,9 +106,9 @@ 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/appdata/config:/config \
+  -v /path/to/ombi/config:/config \
   --restart unless-stopped \
   lscr.io/linuxserver/ombi:latest
 ```
@@ -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)
@@ -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.

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" }

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: ""
+  - {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: |
+  * `BASE_URL` cannot be changed from `/`
+
 # application setup block
 app_setup_block_enabled: true
 app_setup_block: |
   Access the webui at `<your-ip>: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."}

…init-config-end/dependencies.d/init-ombi …nfig-end/dependencies.d/init-ombi-configroot/etc/s6-overlay/s6-rc.d/init-config-end/dependencies.d/init-ombi renamed to root/etc/s6-overlay/s6-rc.d/init-config-end/dependencies.d/init-ombi-config root/etc/s6-overlay/s6-rc.d/init-config-end/dependencies.d/init-ombi renamed to root/etc/s6-overlay/s6-rc.d/init-config-end/dependencies.d/init-ombi-config

@@ -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