Rebase to Jammy

This commit is contained in:
TheSpad 2022-05-01 20:45:12 +01:00
parent 0e722496a7
commit bfb77e1aff
No known key found for this signature in database
GPG Key ID: 08F06191F4587860
8 changed files with 103 additions and 99 deletions

View File

@ -1,4 +1,4 @@
FROM ghcr.io/linuxserver/baseimage-ubuntu:bionic
FROM ghcr.io/linuxserver/baseimage-ubuntu:jammy
# set version label
ARG BUILD_DATE
@ -9,30 +9,30 @@ LABEL maintainer="aptalca"
# environment settings
ENV HOME="/config"
ENV DEBIAN_FRONTEND="noninteractive"
RUN \
apt-get update && \
apt-get install -y \
libicu60 \
libssl1.0 && \
echo "**** install ombi ****" && \
mkdir -p \
/opt/ombi && \
if [ -z ${OMBI_RELEASE+x} ]; then \
OMBI_RELEASE=$(curl -sX GET "https://api.github.com/repos/Ombi-app/Ombi/releases/latest" \
| awk '/tag_name/{print $4;exit}' FS='[""]'); \
fi && \
curl -o \
/tmp/ombi-src.tar.gz -L \
"https://github.com/Ombi-app/Ombi/releases/download/${OMBI_RELEASE}/linux-x64.tar.gz" && \
tar xzf /tmp/ombi-src.tar.gz -C \
/opt/ombi/ && \
chmod +x /opt/ombi/Ombi && \
echo "**** clean up ****" && \
rm -rf \
/tmp/* \
/var/lib/apt/lists/* \
/var/tmp/*
apt-get update && \
apt-get install -y \
libicu70 && \
echo "**** install ombi ****" && \
mkdir -p \
/opt/ombi && \
if [ -z ${OMBI_RELEASE+x} ]; then \
OMBI_RELEASE=$(curl -sX GET "https://api.github.com/repos/Ombi-app/Ombi/releases/latest" \
| awk '/tag_name/{print $4;exit}' FS='[""]'); \
fi && \
curl -o \
/tmp/ombi-src.tar.gz -L \
"https://github.com/Ombi-app/Ombi/releases/download/${OMBI_RELEASE}/linux-x64.tar.gz" && \
tar xzf /tmp/ombi-src.tar.gz -C \
/opt/ombi/ && \
chmod +x /opt/ombi/Ombi && \
echo "**** clean up ****" && \
rm -rf \
/tmp/* \
/var/lib/apt/lists/* \
/var/tmp/*
# add local files
COPY /root /

View File

@ -1,4 +1,4 @@
FROM ghcr.io/linuxserver/baseimage-ubuntu:arm64v8-bionic
FROM ghcr.io/linuxserver/baseimage-ubuntu:arm64v8-jammy
# set version label
ARG BUILD_DATE
@ -7,32 +7,32 @@ ARG OMBI_RELEASE
LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
LABEL maintainer="aptalca"
# environment settings
# environment settings
ENV HOME="/config"
ENV DEBIAN_FRONTEND="noninteractive"
RUN \
apt-get update && \
apt-get install -y \
libicu60 \
libssl1.0 && \
echo "**** install ombi ****" && \
mkdir -p \
/opt/ombi && \
if [ -z ${OMBI_RELEASE+x} ]; then \
OMBI_RELEASE=$(curl -sX GET "https://api.github.com/repos/Ombi-app/Ombi/releases/latest" \
| awk '/tag_name/{print $4;exit}' FS='[""]'); \
fi && \
curl -o \
/tmp/ombi-src.tar.gz -L \
"https://github.com/Ombi-app/Ombi/releases/download/${OMBI_RELEASE}/linux-arm64.tar.gz" && \
tar xzf /tmp/ombi-src.tar.gz -C \
/opt/ombi/ && \
chmod +x /opt/ombi/Ombi && \
echo "**** clean up ****" && \
rm -rf \
/tmp/* \
/var/lib/apt/lists/* \
/var/tmp/*
apt-get update && \
apt-get install -y \
libicu70 && \
echo "**** install ombi ****" && \
mkdir -p \
/opt/ombi && \
if [ -z ${OMBI_RELEASE+x} ]; then \
OMBI_RELEASE=$(curl -sX GET "https://api.github.com/repos/Ombi-app/Ombi/releases/latest" \
| awk '/tag_name/{print $4;exit}' FS='[""]'); \
fi && \
curl -o \
/tmp/ombi-src.tar.gz -L \
"https://github.com/Ombi-app/Ombi/releases/download/${OMBI_RELEASE}/linux-x64.tar.gz" && \
tar xzf /tmp/ombi-src.tar.gz -C \
/opt/ombi/ && \
chmod +x /opt/ombi/Ombi && \
echo "**** clean up ****" && \
rm -rf \
/tmp/* \
/var/lib/apt/lists/* \
/var/tmp/*
# add local files
COPY /root /

View File

@ -1,4 +1,4 @@
FROM ghcr.io/linuxserver/baseimage-ubuntu:arm32v7-bionic
FROM ghcr.io/linuxserver/baseimage-ubuntu:arm32v7-jammy
# set version label
ARG BUILD_DATE
@ -7,32 +7,32 @@ ARG OMBI_RELEASE
LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
LABEL maintainer="aptalca"
# environment settings
# environment settings
ENV HOME="/config"
ENV DEBIAN_FRONTEND="noninteractive"
RUN \
apt-get update && \
apt-get install -y \
libicu60 \
libssl1.0 && \
echo "**** install ombi ****" && \
mkdir -p \
/opt/ombi && \
if [ -z ${OMBI_RELEASE+x} ]; then \
OMBI_RELEASE=$(curl -sX GET "https://api.github.com/repos/Ombi-app/Ombi/releases/latest" \
| awk '/tag_name/{print $4;exit}' FS='[""]'); \
fi && \
curl -o \
/tmp/ombi-src.tar.gz -L \
"https://github.com/Ombi-app/Ombi/releases/download/${OMBI_RELEASE}/linux-arm.tar.gz" && \
tar xzf /tmp/ombi-src.tar.gz -C \
/opt/ombi/ && \
chmod +x /opt/ombi/Ombi && \
echo "**** clean up ****" && \
rm -rf \
/tmp/* \
/var/lib/apt/lists/* \
/var/tmp/*
apt-get update && \
apt-get install -y \
libicu70 && \
echo "**** install ombi ****" && \
mkdir -p \
/opt/ombi && \
if [ -z ${OMBI_RELEASE+x} ]; then \
OMBI_RELEASE=$(curl -sX GET "https://api.github.com/repos/Ombi-app/Ombi/releases/latest" \
| awk '/tag_name/{print $4;exit}' FS='[""]'); \
fi && \
curl -o \
/tmp/ombi-src.tar.gz -L \
"https://github.com/Ombi-app/Ombi/releases/download/${OMBI_RELEASE}/linux-x64.tar.gz" && \
tar xzf /tmp/ombi-src.tar.gz -C \
/opt/ombi/ && \
chmod +x /opt/ombi/Ombi && \
echo "**** clean up ****" && \
rm -rf \
/tmp/* \
/var/lib/apt/lists/* \
/var/tmp/*
# add local files
COPY /root /

8
Jenkinsfile vendored
View File

@ -353,9 +353,11 @@ pipeline {
if [[ ("${BRANCH_NAME}" == "master") || ("${BRANCH_NAME}" == "main") ]] && [[ (! -f ${TEMPDIR}/unraid/templates/unraid/${CONTAINER_NAME}.xml) || ("$(md5sum ${TEMPDIR}/unraid/templates/unraid/${CONTAINER_NAME}.xml | awk '{ print $1 }')" != "$(md5sum ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml | awk '{ print $1 }')") ]]; then
cd ${TEMPDIR}/unraid/templates/
if grep -wq "${CONTAINER_NAME}" ${TEMPDIR}/unraid/templates/unraid/ignore.list; then
echo "Image is on the ignore list, removing Unraid template"
git rm unraid/${CONTAINER_NAME}.xml || :
git commit -m 'Bot Removing Deprecated Unraid Template' || :
echo "Image is on the ignore list, marking Unraid template as deprecated"
cp ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml ${TEMPDIR}/unraid/templates/unraid/
git add -u unraid/${CONTAINER_NAME}.xml
git mv unraid/${CONTAINER_NAME}.xml unraid/deprecated/${CONTAINER_NAME}.xml || :
git commit -m 'Bot Moving Deprecated Unraid Template' || :
else
cp ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml ${TEMPDIR}/unraid/templates/unraid/
git add unraid/${CONTAINER_NAME}.xml

View File

@ -50,26 +50,26 @@ Even automatically send them weekly newsletters of new content that has been add
## Supported Architectures
Our images support multiple architectures such as `x86-64`, `arm64` and `armhf`. We utilise the docker manifest for multi-platform awareness. More information is available from docker [here](https://github.com/docker/distribution/blob/master/docs/spec/manifest-v2-2.md#manifest-list) and our announcement [here](https://blog.linuxserver.io/2019/02/21/the-lsio-pipeline-project/).
We utilise the docker manifest for multi-platform awareness. More information is available from docker [here](https://github.com/docker/distribution/blob/master/docs/spec/manifest-v2-2.md#manifest-list) and our announcement [here](https://blog.linuxserver.io/2019/02/21/the-lsio-pipeline-project/).
Simply pulling `lscr.io/linuxserver/ombi` should retrieve the correct image for your arch, but you can also pull specific arch images via tags.
Simply pulling `lscr.io/linuxserver/ombi:latest` should retrieve the correct image for your arch, but you can also pull specific arch images via tags.
The architectures supported by this image are:
| Architecture | Tag |
| :----: | --- |
| x86-64 | amd64-latest |
| arm64 | arm64v8-latest |
| armhf | arm32v7-latest |
| Architecture | Available | Tag |
| :----: | :----: | ---- |
| x86-64 | ✅ | amd64-\<version tag\> |
| arm64 | ✅ | arm64v8-\<version tag\> |
| armhf| ✅ | arm32v7-\<version tag\> |
## Version Tags
This image provides various versions that are available via tags. `latest` tag usually provides the latest stable version. Others are considered under development and caution must be exercised when using them.
This image provides various versions that are available via tags. Please read the descriptions carefully and exercise caution when using unstable or development tags.
| Tag | Description |
| :----: | --- |
| latest | Stable Ombi releases |
| development | Releases from the `develop` branch of Ombi |
| Tag | Available | Description |
| :----: | :----: |--- |
| latest | ✅ | Stable Ombi releases |
| development | ✅ | Releases from the `develop` branch of Ombi |
## Application Setup
@ -86,7 +86,7 @@ Here are some example snippets to help you get started creating a container.
version: "2.1"
services:
ombi:
image: lscr.io/linuxserver/ombi
image: lscr.io/linuxserver/ombi:latest
container_name: ombi
environment:
- PUID=1000
@ -112,7 +112,7 @@ docker run -d \
-p 3579:3579 \
-v /path/to/appdata/config:/config \
--restart unless-stopped \
lscr.io/linuxserver/ombi
lscr.io/linuxserver/ombi:latest
```
## Parameters
@ -171,7 +171,7 @@ We publish various [Docker Mods](https://github.com/linuxserver/docker-mods) to
* container version number
* `docker inspect -f '{{ index .Config.Labels "build_version" }}' ombi`
* image version number
* `docker inspect -f '{{ index .Config.Labels "build_version" }}' lscr.io/linuxserver/ombi`
* `docker inspect -f '{{ index .Config.Labels "build_version" }}' lscr.io/linuxserver/ombi:latest`
## Updating Info
@ -189,7 +189,7 @@ Below are the instructions for updating containers:
### Via Docker Run
* Update the image: `docker pull lscr.io/linuxserver/ombi`
* Update the image: `docker pull lscr.io/linuxserver/ombi:latest`
* Stop the running container: `docker stop ombi`
* Delete the container: `docker rm ombi`
* Recreate a new container with the same docker run parameters as instructed above (if mapped correctly to a host folder, your `/config` folder and settings will be preserved)
@ -237,6 +237,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
## Versions
* **01.05.22:** - Rebase to Jammy.
* **26.04.21:** - Update tarball name, allow for v4 builds in stable.
* **18.01.21:** - Update upstream repo. Deprecate `v4-preview` tag, which is merged to `development` tag upstream.
* **14.04.20:** - Add Ombi donate links.

View File

@ -5,14 +5,14 @@ project_name: ombi
project_url: "https://ombi.io"
project_logo: "https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/ombi.png"
project_blurb: "[{{ project_name|capitalize }}]({{ project_url }}) allows you to host your own Plex Request and user management system.
If you are sharing your Plex server with other users, allow them to request new content using an easy to manage interface!
Manage all your requests for Movies and TV with ease, leave notes for the user and get notification when a user requests something.
If you are sharing your Plex server with other users, allow them to request new content using an easy to manage interface!
Allow your users to post issues against their requests so you know there is a problem with the audio etc.
Manage all your requests for Movies and TV with ease, leave notes for the user and get notification when a user requests something.
Even automatically send them weekly newsletters of new content that has been added to your Plex server!"
Allow your users to post issues against their requests so you know there is a problem with the audio etc.
Even automatically send them weekly newsletters of new content that has been added to your Plex server!"
project_lsio_github_repo_url: "https://github.com/linuxserver/docker-{{ project_name }}"
# supported architectures
@ -55,6 +55,7 @@ app_setup_block: |
# changelog
changelogs:
- { date: "01.05.22:", desc: "Rebase to Jammy." }
- { date: "26.04.21:", desc: "Update tarball name, allow for v4 builds in stable." }
- { date: "18.01.21:", desc: "Update upstream repo. Deprecate `v4-preview` tag, which is merged to `development` tag upstream." }
- { date: "14.04.20:", desc: "Add Ombi donate links." }

View File

@ -2,5 +2,5 @@
# permissions
chown -R abc:abc \
/opt/ombi \
/config
/opt/ombi \
/config

View File

@ -2,9 +2,9 @@
cd /opt/ombi || exit
if [[ ! -z "${BASE_URL}" ]]; then
if [[ -n "${BASE_URL}" ]]; then
EXTRA_PARAM="--baseurl ${BASE_URL}"
fi
exec \
s6-setuidgid abc /opt/ombi/Ombi --storage "/config" --host http://*:3579 ${EXTRA_PARAM}
s6-setuidgid abc /opt/ombi/Ombi --storage "/config" --host http://*:3579 ${EXTRA_PARAM}