Rebase to noble

This commit is contained in:
thespad 2024-07-08 17:59:24 +01:00
parent a63c092710
commit 2f33c0e2c7
No known key found for this signature in database
GPG Key ID: 08F06191F4587860
16 changed files with 41 additions and 29 deletions

View File

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

View File

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

4
Jenkinsfile vendored
View File

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

View File

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

View File

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

View File

@ -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 `<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."}

View File

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

View File

@ -0,0 +1 @@
/etc/s6-overlay/s6-rc.d/init-ombi-config/run

View File

@ -1,6 +0,0 @@
#!/usr/bin/with-contenv bash
# permissions
chown -R abc:abc \
/app/ombi \
/config

View File

@ -1 +0,0 @@
/etc/s6-overlay/s6-rc.d/init-ombi/run

View File

@ -1,4 +1,5 @@
#!/usr/bin/with-contenv bash
# shellcheck shell=bash
if [[ -n "${BASE_URL}" ]]; then
EXTRA_PARAM="--baseurl ${BASE_URL}"