Rebase to 3.17, migrate to s6v3

This commit is contained in:
TheSpad 2023-02-11 20:13:36 +00:00
parent 5781d50371
commit b07c8331a8
No known key found for this signature in database
GPG Key ID: 08F06191F4587860
20 changed files with 63 additions and 67 deletions

View File

@ -1,4 +1,6 @@
FROM ghcr.io/linuxserver/baseimage-ubuntu:focal
# syntax=docker/dockerfile:1
FROM ghcr.io/linuxserver/baseimage-alpine:3.17
# set version label
ARG BUILD_DATE
@ -8,16 +10,13 @@ LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DA
LABEL maintainer="thelamer"
# environment settings
ARG DEBIAN_FRONTEND="noninteractive"
ENV XDG_DATA_HOME="/config" \
XDG_CONFIG_HOME="/config"
RUN \
echo "**** install packages ****" && \
apt-get update && \
apt-get install -y \
jq \
libicu66 && \
apk --no-cache add \
icu-libs && \
echo "**** install jackett ****" && \
mkdir -p \
/app/Jackett && \
@ -27,19 +26,15 @@ RUN \
fi && \
curl -o \
/tmp/jacket.tar.gz -L \
"https://github.com/Jackett/Jackett/releases/download/${JACKETT_RELEASE}/Jackett.Binaries.LinuxAMDx64.tar.gz" && \
"https://github.com/Jackett/Jackett/releases/download/${JACKETT_RELEASE}/Jackett.Binaries.LinuxMuslAMDx64.tar.gz" && \
tar xf \
/tmp/jacket.tar.gz -C \
/app/Jackett --strip-components=1 && \
echo "**** fix for host id mapping error ****" && \
chown -R root:root /app/Jackett && \
echo "**** cleanup ****" && \
apt-get clean && \
rm -rf \
/tmp/* \
/var/lib/apt/lists/* \
/var/tmp/* \
/var/log/*
/tmp/*
# add local files
COPY root/ /

View File

@ -1,4 +1,6 @@
FROM ghcr.io/linuxserver/baseimage-ubuntu:arm64v8-focal
# syntax=docker/dockerfile:1
FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.17
# set version label
ARG BUILD_DATE
@ -8,16 +10,13 @@ LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DA
LABEL maintainer="thelamer"
# environment settings
ARG DEBIAN_FRONTEND="noninteractive"
ENV XDG_DATA_HOME="/config" \
XDG_CONFIG_HOME="/config"
RUN \
echo "**** install packages ****" && \
apt-get update && \
apt-get install -y \
jq \
libicu66 && \
apk --no-cache add \
icu-libs && \
echo "**** install jackett ****" && \
mkdir -p \
/app/Jackett && \
@ -27,19 +26,15 @@ RUN \
fi && \
curl -o \
/tmp/jacket.tar.gz -L \
"https://github.com/Jackett/Jackett/releases/download/${JACKETT_RELEASE}/Jackett.Binaries.LinuxARM64.tar.gz" && \
"https://github.com/Jackett/Jackett/releases/download/${JACKETT_RELEASE}/Jackett.Binaries.LinuxMuslARM64.tar.gz" && \
tar xf \
/tmp/jacket.tar.gz -C \
/app/Jackett --strip-components=1 && \
echo "**** fix for host id mapping error ****" && \
chown -R root:root /app/Jackett && \
echo "**** cleanup ****" && \
apt-get clean && \
rm -rf \
/tmp/* \
/var/lib/apt/lists/* \
/var/tmp/* \
/var/log/*
/tmp/*
# add local files
COPY root/ /

View File

@ -1,4 +1,6 @@
FROM ghcr.io/linuxserver/baseimage-ubuntu:arm32v7-focal
# syntax=docker/dockerfile:1
FROM ghcr.io/linuxserver/baseimage-alpine:arm32v7-3.17
# set version label
ARG BUILD_DATE
@ -8,16 +10,13 @@ LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DA
LABEL maintainer="thelamer"
# environment settings
ARG DEBIAN_FRONTEND="noninteractive"
ENV XDG_DATA_HOME="/config" \
XDG_CONFIG_HOME="/config"
RUN \
echo "**** install packages ****" && \
apt-get update && \
apt-get install -y \
jq \
libicu66 && \
apk --no-cache add \
icu-libs && \
echo "**** install jackett ****" && \
mkdir -p \
/app/Jackett && \
@ -27,19 +26,15 @@ RUN \
fi && \
curl -o \
/tmp/jacket.tar.gz -L \
"https://github.com/Jackett/Jackett/releases/download/${JACKETT_RELEASE}/Jackett.Binaries.LinuxARM32.tar.gz" && \
"https://github.com/Jackett/Jackett/releases/download/${JACKETT_RELEASE}/Jackett.Binaries.LinuxMuslARM32.tar.gz" && \
tar xf \
/tmp/jacket.tar.gz -C \
/app/Jackett --strip-components=1 && \
echo "**** fix for host id mapping error ****" && \
chown -R root:root /app/Jackett && \
echo "**** cleanup ****" && \
apt-get clean && \
rm -rf \
/tmp/* \
/var/lib/apt/lists/* \
/var/tmp/* \
/var/log/*
/tmp/*
# add local files
COPY root/ /

2
Jenkinsfile vendored
View File

@ -27,7 +27,7 @@ pipeline {
DOCKERHUB_IMAGE = 'linuxserver/jackett'
DEV_DOCKERHUB_IMAGE = 'lsiodev/jackett'
PR_DOCKERHUB_IMAGE = 'lspipepr/jackett'
DIST_IMAGE = 'ubuntu'
DIST_IMAGE = 'alpine'
MULTIARCH='true'
CI='true'
CI_WEB='true'

View File

@ -90,10 +90,10 @@ services:
- PUID=1000
- PGID=1000
- TZ=Etc/UTC
- "RUN_OPTS=<run options here>" #optional
- RUN_OPTS= #optional
volumes:
- <path to data>:/config
- <path to blackhole>:/downloads
- /path/to/data:/config
- /path/to/blackhole:/downloads
ports:
- 9117:9117
restart: unless-stopped
@ -107,10 +107,10 @@ docker run -d \
-e PUID=1000 \
-e PGID=1000 \
-e TZ=Etc/UTC \
-e RUN_OPTS="<run options here>" `#optional` \
-e RUN_OPTS= `#optional` \
-p 9117:9117 \
-v <path to data>:/config \
-v <path to blackhole>:/downloads \
-v /path/to/data:/config \
-v /path/to/blackhole:/downloads \
--restart unless-stopped \
lscr.io/linuxserver/jackett:development
@ -126,7 +126,7 @@ Container images are configured using parameters passed at runtime (such as thos
| `-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 RUN_OPTS=<run options here>` | Optionally specify additional arguments to be passed. |
| `-e RUN_OPTS=` | Optionally specify additional arguments to be passed. |
| `-v /config` | Where Jackett should store its config file. |
| `-v /downloads` | Path to torrent blackhole. |
@ -239,6 +239,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
## Versions
* **11.02.23:** - Rebase to Alpine 3.17.
* **31.12.19:** - Rebase to Focal.
* **31.12.19:** - Remove agressive startup chowning.
* **23.03.19:** - Switching to new Base images, shift to arm32v7 tag.

View File

@ -17,7 +17,7 @@ repo_vars:
- DOCKERHUB_IMAGE = 'linuxserver/jackett'
- DEV_DOCKERHUB_IMAGE = 'lsiodev/jackett'
- PR_DOCKERHUB_IMAGE = 'lspipepr/jackett'
- DIST_IMAGE = 'ubuntu'
- DIST_IMAGE = 'alpine'
- MULTIARCH='true'
- CI='true'
- CI_WEB='true'

View File

@ -30,8 +30,8 @@ param_env_vars:
- { env_var: "TZ", env_value: "Europe/London", desc: "Specify a timezone to use EG Europe/London." }
param_usage_include_vols: true
param_volumes:
- { vol_path: "/config", vol_host_path: "<path to data>", desc: "Where Jackett should store its config file." }
- { vol_path: "/downloads", vol_host_path: "<path to blackhole>", desc: "Path to torrent blackhole." }
- { vol_path: "/config", vol_host_path: "/path/to/data", desc: "Where Jackett should store its config file." }
- { vol_path: "/downloads", vol_host_path: "/path/to/blackhole", desc: "Path to torrent blackhole." }
param_usage_include_ports: true
param_ports:
- { external_port: "9117", internal_port: "9117", port_desc: "WebUI" }
@ -41,7 +41,7 @@ cap_add_param: false
# optional container parameters
opt_param_usage_include_env: true
opt_param_env_vars:
- { env_var: "RUN_OPTS", env_value: "<run options here>", desc: "Optionally specify additional arguments to be passed." }
- { env_var: "RUN_OPTS", env_value: "", desc: "Optionally specify additional arguments to be passed." }
opt_param_usage_include_vols: false
opt_param_usage_include_ports: false
opt_param_device_map: false
@ -58,6 +58,7 @@ app_setup_block: |
# changelog
changelogs:
- { date: "11.02.23:", desc: "Rebase to Alpine 3.17." }
- { date: "31.12.19:", desc: "Rebase to Focal." }
- { date: "31.12.19:", desc: "Remove agressive startup chowning." }
- { date: "23.03.19:", desc: "Switching to new Base images, shift to arm32v7 tag." }

View File

@ -1,9 +0,0 @@
#!/usr/bin/with-contenv bash
chown -R abc:abc \
/config
if [ -z ${AUTO_UPDATE+x} ] || [ "${AUTO_UPDATE}" == "true" ]; then
chown -R abc:abc \
/app/Jackett
fi

View File

@ -0,0 +1,11 @@
#!/usr/bin/with-contenv bash
# shellcheck shell=bash
if [[ -z ${AUTO_UPDATE+x} ]] || [[ "${AUTO_UPDATE}" == "true" ]]; then
lsiown -R abc:abc \
/app/Jackett
fi
# permissions
lsiown -R abc:abc \
/config

View File

@ -0,0 +1 @@
oneshot

View File

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

View File

@ -0,0 +1 @@
3

View File

@ -0,0 +1,13 @@
#!/usr/bin/with-contenv bash
# shellcheck shell=bash
if [[ -z ${AUTO_UPDATE+x} ]] || [[ "${AUTO_UPDATE}" == "true" ]]; then
COMMAND="/app/Jackett/jackett_launcher.sh"
else
COMMAND="/app/Jackett/jackett --NoUpdates"
fi
exec \
s6-notifyoncheck -d -n 300 -w 1000 -c "nc -z localhost 9117" \
s6-setuidgid abc ${COMMAND} ${RUN_OPTS}

View File

@ -0,0 +1 @@
longrun

View File

@ -1,10 +0,0 @@
#!/usr/bin/with-contenv bash
if [ -z ${AUTO_UPDATE+x} ] || [ "${AUTO_UPDATE}" == "true" ]; then
COMMAND="/app/Jackett/jackett_launcher.sh"
else
COMMAND="/app/Jackett/jackett --NoUpdates"
fi
exec \
s6-setuidgid abc ${COMMAND} ${RUN_OPTS}