Skip to content

Commit 2f33c0e

Browse files
committed
Rebase to noble
1 parent a63c092 commit 2f33c0e

File tree

16 files changed

+41
-29
lines changed

16 files changed

+41
-29
lines changed

Dockerfile

+7-5
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ghcr.io/linuxserver/baseimage-ubuntu:jammy
1+
FROM ghcr.io/linuxserver/baseimage-ubuntu:noble
22

33
# set version label
44
ARG BUILD_DATE
@@ -8,14 +8,15 @@ LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DA
88
LABEL maintainer="aptalca"
99

1010
# environment settings
11-
ENV HOME="/config"
12-
ENV DEBIAN_FRONTEND="noninteractive"
11+
ENV HOME="/config" \
12+
COMPlus_EnableDiagnostics=0 \
13+
DEBIAN_FRONTEND="noninteractive" \
14+
TMPDIR=/run/ombi-temp
1315

1416
RUN \
1517
apt-get update && \
1618
apt-get install -y \
17-
libicu70 \
18-
netcat && \
19+
libicu74 && \
1920
echo "**** install ombi ****" && \
2021
mkdir -p \
2122
/app/ombi && \
@@ -29,6 +30,7 @@ RUN \
2930
tar xzf /tmp/ombi-src.tar.gz -C \
3031
/app/ombi/ && \
3132
chmod +x /app/ombi/Ombi && \
33+
printf "Linuxserver.io version: ${VERSION}\nBuild-date: ${BUILD_DATE}" > /build_version && \
3234
echo "**** clean up ****" && \
3335
rm -rf \
3436
/tmp/* \

Dockerfile.aarch64

+7-5
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ghcr.io/linuxserver/baseimage-ubuntu:arm64v8-jammy
1+
FROM ghcr.io/linuxserver/baseimage-ubuntu:arm64v8-noble
22

33
# set version label
44
ARG BUILD_DATE
@@ -8,14 +8,15 @@ LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DA
88
LABEL maintainer="aptalca"
99

1010
# environment settings
11-
ENV HOME="/config"
12-
ENV DEBIAN_FRONTEND="noninteractive"
11+
ENV HOME="/config" \
12+
COMPlus_EnableDiagnostics=0 \
13+
DEBIAN_FRONTEND="noninteractive" \
14+
TMPDIR=/run/ombi-temp
1315

1416
RUN \
1517
apt-get update && \
1618
apt-get install -y \
17-
libicu70 \
18-
netcat && \
19+
libicu74 && \
1920
echo "**** install ombi ****" && \
2021
mkdir -p \
2122
/app/ombi && \
@@ -29,6 +30,7 @@ RUN \
2930
tar xzf /tmp/ombi-src.tar.gz -C \
3031
/app/ombi/ && \
3132
chmod +x /app/ombi/Ombi && \
33+
printf "Linuxserver.io version: ${VERSION}\nBuild-date: ${BUILD_DATE}" > /build_version && \
3234
echo "**** clean up ****" && \
3335
rm -rf \
3436
/tmp/* \

Jenkinsfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@ pipeline {
3434
CI_PORT='3579'
3535
CI_SSL='false'
3636
CI_DELAY='120'
37-
CI_DOCKERENV='TZ=US/Pacific'
38-
CI_AUTH='user:password'
37+
CI_DOCKERENV=''
38+
CI_AUTH=''
3939
CI_WEBPATH=''
4040
}
4141
stages {

README.md

+3-2
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ services:
9292
- TZ=Etc/UTC
9393
- BASE_URL=/ombi #optional
9494
volumes:
95-
- /path/to/appdata/config:/config
95+
- /path/to/ombi/config:/config
9696
ports:
9797
- 3579:3579
9898
restart: unless-stopped
@@ -108,7 +108,7 @@ docker run -d \
108108
-e TZ=Etc/UTC \
109109
-e BASE_URL=/ombi `#optional` \
110110
-p 3579:3579 \
111-
-v /path/to/appdata/config:/config \
111+
-v /path/to/ombi/config:/config \
112112
--restart unless-stopped \
113113
lscr.io/linuxserver/ombi:latest
114114
```
@@ -287,6 +287,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
287287

288288
## Versions
289289

290+
* **08.07.24:** - Rebase to Ubuntu Noble.
290291
* **01.07.23:** - Deprecate armhf. As announced [here](https://www.linuxserver.io/blog/a-farewell-to-arm-hf)
291292
* **11.09.22:** - Migrate to s6v3.
292293
* **01.05.22:** - Rebase to Jammy.

jenkins-vars.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ repo_vars:
2424
- CI_PORT='3579'
2525
- CI_SSL='false'
2626
- CI_DELAY='120'
27-
- CI_DOCKERENV='TZ=US/Pacific'
28-
- CI_AUTH='user:password'
27+
- CI_DOCKERENV=''
28+
- CI_AUTH=''
2929
- CI_WEBPATH=''
3030
sponsor_links:
3131
- { name: "Ombi - Patreon", url: "https://patreon.com/tidusjar" }

readme-vars.yml

+7-6
Original file line numberDiff line numberDiff line change
@@ -20,25 +20,26 @@ common_param_env_vars_enabled: true
2020
param_container_name: "{{ project_name }}"
2121
param_usage_include_vols: true
2222
param_volumes:
23-
- {vol_path: "/config", vol_host_path: "/path/to/appdata/config", desc: "Contains all relevant configuration files."}
23+
- {vol_path: "/config", vol_host_path: "/path/to/{{ project_name }}/config", desc: "Contains all relevant configuration files."}
2424
param_usage_include_ports: true
2525
param_ports:
2626
- {external_port: "3579", internal_port: "3579", port_desc: "web gui"}
27-
param_usage_include_env: true
28-
param_env_vars:
29-
- {env_var: "TZ", env_value: "Europe/London", desc: "Specify a timezone to use EG Europe/London"}
3027
# optional container parameters
3128
opt_param_usage_include_env: true
3229
opt_param_env_vars:
3330
- {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."}
34-
optional_block_1: false
35-
optional_block_1_items: ""
31+
32+
readonly_supported: true
33+
readonly_message: |
34+
* `BASE_URL` cannot be changed from `/`
35+
3636
# application setup block
3737
app_setup_block_enabled: true
3838
app_setup_block: |
3939
Access the webui at `<your-ip>:3579`. Follow the setup wizard on initial install. Then configure the required services.
4040
# changelog
4141
changelogs:
42+
- {date: "08.07.24:", desc: "Rebase to Ubuntu Noble."}
4243
- {date: "01.07.23:", desc: "Deprecate armhf. As announced [here](https://www.linuxserver.io/blog/a-farewell-to-arm-hf)"}
4344
- {date: "11.09.22:", desc: "Migrate to s6v3."}
4445
- {date: "01.05.22:", desc: "Rebase to Jammy."}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
#!/usr/bin/with-contenv bash
2+
# shellcheck shell=bash
3+
4+
mkdir -p /run/ombi-temp
5+
6+
# permissions
7+
lsiown -R abc:abc \
8+
/run/ombi-temp \
9+
/config
10+
11+
lsiown abc:abc /app/ombi/ClientApp/dist/index.html > /dev/null 2>&1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
/etc/s6-overlay/s6-rc.d/init-ombi-config/run

root/etc/s6-overlay/s6-rc.d/init-ombi/run

-6
This file was deleted.

root/etc/s6-overlay/s6-rc.d/init-ombi/up

-1
This file was deleted.

root/etc/s6-overlay/s6-rc.d/svc-ombi/run

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
#!/usr/bin/with-contenv bash
2+
# shellcheck shell=bash
23

34
if [[ -n "${BASE_URL}" ]]; then
45
EXTRA_PARAM="--baseurl ${BASE_URL}"

root/etc/s6-overlay/s6-rc.d/user/contents.d/init-ombi

Whitespace-only changes.

0 commit comments

Comments
 (0)