mirror of
https://github.com/linuxserver/docker-ombi.git
synced 2026-02-20 00:58:02 +08:00
Merge pull request #105 from linuxserver/s6v3-master
This commit is contained in:
commit
23a7c44e93
11
Dockerfile
11
Dockerfile
@ -1,4 +1,4 @@
|
||||
FROM ghcr.io/linuxserver/baseimage-ubuntu:jammy-cd65f39a-ls39
|
||||
FROM ghcr.io/linuxserver/baseimage-ubuntu:jammy
|
||||
|
||||
# set version label
|
||||
ARG BUILD_DATE
|
||||
@ -14,10 +14,11 @@ ENV DEBIAN_FRONTEND="noninteractive"
|
||||
RUN \
|
||||
apt-get update && \
|
||||
apt-get install -y \
|
||||
libicu70 && \
|
||||
libicu70 \
|
||||
netcat && \
|
||||
echo "**** install ombi ****" && \
|
||||
mkdir -p \
|
||||
/opt/ombi && \
|
||||
/app/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='[""]'); \
|
||||
@ -26,8 +27,8 @@ RUN \
|
||||
/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 && \
|
||||
/app/ombi/ && \
|
||||
chmod +x /app/ombi/Ombi && \
|
||||
echo "**** clean up ****" && \
|
||||
rm -rf \
|
||||
/tmp/* \
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
FROM ghcr.io/linuxserver/baseimage-ubuntu:arm64v8-jammy-cd65f39a-ls39
|
||||
FROM ghcr.io/linuxserver/baseimage-ubuntu:arm64v8-jammy
|
||||
|
||||
# set version label
|
||||
ARG BUILD_DATE
|
||||
@ -14,10 +14,11 @@ ENV DEBIAN_FRONTEND="noninteractive"
|
||||
RUN \
|
||||
apt-get update && \
|
||||
apt-get install -y \
|
||||
libicu70 && \
|
||||
libicu70 \
|
||||
netcat && \
|
||||
echo "**** install ombi ****" && \
|
||||
mkdir -p \
|
||||
/opt/ombi && \
|
||||
/app/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='[""]'); \
|
||||
@ -26,8 +27,8 @@ RUN \
|
||||
/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 && \
|
||||
/app/ombi/ && \
|
||||
chmod +x /app/ombi/Ombi && \
|
||||
echo "**** clean up ****" && \
|
||||
rm -rf \
|
||||
/tmp/* \
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
FROM ghcr.io/linuxserver/baseimage-ubuntu:arm32v7-jammy-cd65f39a-ls39
|
||||
FROM ghcr.io/linuxserver/baseimage-ubuntu:arm32v7-jammy
|
||||
|
||||
# set version label
|
||||
ARG BUILD_DATE
|
||||
@ -14,10 +14,11 @@ ENV DEBIAN_FRONTEND="noninteractive"
|
||||
RUN \
|
||||
apt-get update && \
|
||||
apt-get install -y \
|
||||
libicu70 && \
|
||||
libicu70 \
|
||||
netcat && \
|
||||
echo "**** install ombi ****" && \
|
||||
mkdir -p \
|
||||
/opt/ombi && \
|
||||
/app/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='[""]'); \
|
||||
@ -26,8 +27,8 @@ RUN \
|
||||
/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 && \
|
||||
/app/ombi/ && \
|
||||
chmod +x /app/ombi/Ombi && \
|
||||
echo "**** clean up ****" && \
|
||||
rm -rf \
|
||||
/tmp/* \
|
||||
|
||||
@ -55,6 +55,7 @@ app_setup_block: |
|
||||
|
||||
# changelog
|
||||
changelogs:
|
||||
- { date: "11.09.22:", desc: "Migrate to s6v3." }
|
||||
- { 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." }
|
||||
|
||||
2
root/etc/cont-init.d/30-config → root/etc/s6-overlay/s6-rc.d/init-ombi/run
Normal file → Executable file
2
root/etc/cont-init.d/30-config → root/etc/s6-overlay/s6-rc.d/init-ombi/run
Normal file → Executable file
@ -2,5 +2,5 @@
|
||||
|
||||
# permissions
|
||||
chown -R abc:abc \
|
||||
/opt/ombi \
|
||||
/app/ombi \
|
||||
/config
|
||||
1
root/etc/s6-overlay/s6-rc.d/init-ombi/type
Normal file
1
root/etc/s6-overlay/s6-rc.d/init-ombi/type
Normal file
@ -0,0 +1 @@
|
||||
oneshot
|
||||
1
root/etc/s6-overlay/s6-rc.d/init-ombi/up
Normal file
1
root/etc/s6-overlay/s6-rc.d/init-ombi/up
Normal file
@ -0,0 +1 @@
|
||||
/etc/s6-overlay/s6-rc.d/init-ombi/run
|
||||
1
root/etc/s6-overlay/s6-rc.d/svc-ombi/notification-fd
Normal file
1
root/etc/s6-overlay/s6-rc.d/svc-ombi/notification-fd
Normal file
@ -0,0 +1 @@
|
||||
3
|
||||
8
root/etc/s6-overlay/s6-rc.d/svc-ombi/run
Executable file
8
root/etc/s6-overlay/s6-rc.d/svc-ombi/run
Executable file
@ -0,0 +1,8 @@
|
||||
#!/usr/bin/with-contenv bash
|
||||
|
||||
if [[ -n "${BASE_URL}" ]]; then
|
||||
EXTRA_PARAM="--baseurl ${BASE_URL}"
|
||||
fi
|
||||
|
||||
s6-notifyoncheck -d -n 60 -w 5000 -c "nc -z 127.0.0.1 3579" \
|
||||
cd /app/ombi s6-setuidgid abc /app/ombi/Ombi --storage "/config" --host http://*:3579 ${EXTRA_PARAM}
|
||||
1
root/etc/s6-overlay/s6-rc.d/svc-ombi/type
Normal file
1
root/etc/s6-overlay/s6-rc.d/svc-ombi/type
Normal file
@ -0,0 +1 @@
|
||||
longrun
|
||||
@ -1,10 +0,0 @@
|
||||
#!/usr/bin/with-contenv bash
|
||||
|
||||
cd /opt/ombi || exit
|
||||
|
||||
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}
|
||||
Loading…
x
Reference in New Issue
Block a user