avm/hassio-addons
1
0
Fork 0
mirror of https://github.com/alexbelgium/hassio-addons.git synced 2026-01-20 03:28:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

move config to addons_config

Browse Source
This commit is contained in:
Alexandre
2021-12-29 12:57:15 +01:00
parent fc18cf345f
commit b1842412dd
38 changed files with 320 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
bazarr/CHANGELOG.md
View File

@@ -1,7 +1,8 @@
- Cleanup: config base folder changed to /config/addons_config
- Cleanup: config base folder changed to /config/addons_config (thanks @bruvv)
- New standardized logic for Dockerfile build and packages installation
## 1.0.1 (20-11-2021)
- Update to latest version from linuxserver/docker-bazarr
- Allow mounting local drives by label. Just pust the label instead of sda1 for example
- Improve SMB mount code to v1.5 ; accepts several network disks separated by commas (//123.12.12.12/share,//123.12.12.12/hello) that are mount to /mnt/$sharename

3
filebrowser/CHANGELOG.md
View File

@@ -1,11 +1,14 @@
- Cleanup: config base folder changed to /config/addons_config (thanks @bruvv)
## 2.20.1 (23-12-2021)
- Update to latest version from hurlenko/filebrowser-docker
- Mount ssl in write
- New standardized logic for Dockerfile build and packages installation
- Mount nvme drives
## 2.19.0 (25-11-2021)
- Update to latest version from hurlenko/filebrowser-docker
- Allow mounting local drives by label. Just pust the label instead of sda1 for example

3
filebrowser/Dockerfile
View File

@@ -21,9 +21,6 @@ FROM hurlenko/filebrowser:v${BUILD_UPSTREAM}
# 2 Modify Image #
##################
RUN \
# Correct upstream image folders links
mkdir -p -m 777 /config/filebrowser
##################
# 3 Install apps #

14
filebrowser/rootfs/scripts/20-folders.sh Normal file
View File

@@ -0,0 +1,14 @@
#!/usr/bin/with-contenv bash
if [ -d /config/filebrowser ]; then
echo "Moving to new location /config/addons_config/filebrowser"
mkdir -p /config/addons_config/filebrowser
chmod 777 /config/addons_config/filebrowser
mv /config/filebrowser/* /config/addons_config/filebrowser/
fi
if [ ! -d /config/addons_config/filebrowser ]; then
echo "Creating /config/addons_config/filebrowser"
mkdir -p /config/addons_config/filebrowser
chmod 777 /config/addons_config/filebrowser
fi

6
filebrowser/rootfs/scripts/99-run.sh
View File

@@ -59,7 +59,7 @@ NOAUTH=""
if bashio::config.true 'NoAuth'; then
if ! bashio::fs.file_exists "/data/noauth"; then
rm /data/auth &>/dev/null || true
rm /config/filebrowser/filebrowser.dB &>/dev/null || true
rm /config/addons_config/filebrowser/filebrowser.dB &>/dev/null || true
touch /data/noauth
NOAUTH="--noauth"
bashio::log.warning "Auth method change, database reset"
@@ -68,7 +68,7 @@ if bashio::config.true 'NoAuth'; then
else
if ! bashio::fs.file_exists "/data/auth"; then
rm /data/noauth &>/dev/null || true
rm /config/filebrowser/filebrowser.dB &>/dev/null || true
rm /config/addons_config/filebrowser/filebrowser.dB &>/dev/null || true
touch /data/auth
bashio::log.warning "Auth method change, database reset"
fi
@@ -83,7 +83,7 @@ fi
bashio::log.info "Starting..."
/./filebrowser $CERTFILE $KEYFILE --root=$BASE_FOLDER --address=0.0.0.0 --database=/config/filebrowser/filebrowser.dB $NOAUTH &
/./filebrowser $CERTFILE $KEYFILE --root=$BASE_FOLDER --address=0.0.0.0 --database=/config/addons_config/filebrowser/filebrowser.dB $NOAUTH &
bashio::net.wait_for 8080 localhost 900 || true
bashio::log.info "Started !"
exec nginx

6
flexget/Dockerfile
View File

@@ -28,9 +28,9 @@ RUN \
&& sed -i 's/{PGID:-911}/(bashio::config "PGID")/g' /etc/cont-init.d/10-adduser \
\
# Correct config folder
&& grep -rl " /config" /etc/cont-init.d | xargs sed -i 's| /config| /config/flexget|g' \
&& grep -rl " /config" /etc/services.d | xargs sed -i 's| /config| /config/flexget|g' \
&& sed -i 's=/config/flexget=/config/flexget || true=g' /etc/cont-init.d/10-adduser \
&& grep -rl " /config" /etc/cont-init.d | xargs sed -i 's| /config| /config/addons_config/flexget|g' \
&& grep -rl " /config" /etc/services.d | xargs sed -i 's| /config| /config/addons_config/flexget|g' \
&& sed -i 's=/config/flexget=/config/addons_config/flexget || true=g' /etc/cont-init.d/10-adduser \
\
# Set password
&& sed -i 's/bash/bashio/g' /etc/cont-init.d/20-config \

17
flexget/rootfs/etc/cont-init.d/00-folders.sh
View File

@@ -1,3 +1,16 @@
#!/usr/bin/with-contenv bashio
#!/usr/bin/with-contenv bash
mkdir -p /config/flexget
slug=flexget
if [ -d /config/$slug ]; then
echo "Moving to new location /config/addons_config/$slug"
mkdir -p /config/addons_config/$slug
chmod 777 /config/addons_config/$slug
mv /config/$slug/* /config/addons_config/$slug/
fi
if [ ! -d /config/addons_config/$slug ]; then
echo "Creating /config/addons_config/$slug"
mkdir -p /config/addons_config/$slug
chmod 777 /config/addons_config/$slug
fi

41
jackett/CHANGELOG.md
View File

@@ -1,122 +1,161 @@
- Cleanup: config base folder changed to /config/addons_config
- Cleanup: config base folder changed to /config/addons_config (thanks @bruvv)
## 0.20.200 (28-12-2021)
- Update to latest version from linuxserver/docker-jackett
## 0.20.197 (24-12-2021)
- Update to latest version from linuxserver/docker-jackett
## 0.20.193 (23-12-2021)
- Update to latest version from linuxserver/docker-jackett
## 0.20.184 (20-12-2021)
- Update to latest version from linuxserver/docker-jackett
## 0.20.173 (18-12-2021)
- Update to latest version from linuxserver/docker-jackett
## 0.20.172 (15-12-2021)
- Update to latest version from linuxserver/docker-jackett
## 0.20.162 (14-12-2021)
- Update to latest version from linuxserver/docker-jackett
## 0.20.159 (12-12-2021)
- Update to latest version from linuxserver/docker-jackett
- New standardized logic for Dockerfile build and packages installation
- Removed full access (not used anymore)
## 0.20.147 (11-12-2021)
- Update to latest version from linuxserver/docker-jackett
## 0.20.141 (10-12-2021)
- Update to latest version from linuxserver/docker-jackett
## 0.20.136 (09-12-2021)
- Update to latest version from linuxserver/docker-jackett
## 0.20.123 (09-12-2021)
- Update to latest version from linuxserver/docker-jackett
## 0.20.105 (07-12-2021)
- Update to latest version from linuxserver/docker-jackett
## 0.20.95 (07-12-2021)
- Update to latest version from linuxserver/docker-jackett
## 0.20.83 (03-12-2021)
- Update to latest version from linuxserver/docker-jackett
## 0.20.79 (02-12-2021)
- Update to latest version from linuxserver/docker-jackett
## 0.20.78 (30-11-2021)
- Update to latest version from linuxserver/docker-jackett
## 0.20.74 (30-11-2021)
- Update to latest version from linuxserver/docker-jackett
## 0.20.68 (27-11-2021)
- Update to latest version from linuxserver/docker-jackett
## 0.20.65 (26-11-2021)
- Update to latest version from linuxserver/docker-jackett
## 0.20.64 (25-11-2021)
- Update to latest version from linuxserver/docker-jackett
## 0.20.63 (24-11-2021)
- Update to latest version from linuxserver/docker-jackett
## 0.20.53 (22-11-2021)
- Update to latest version from linuxserver/docker-jackett
## 0.20.44 (21-11-2021)
- Update to latest version from linuxserver/docker-jackett
## 0.20.43 (20-11-2021)
- Update to latest version from linuxserver/docker-jackett
## 0.20.41 (20-11-2021)
- Update to latest version from linuxserver/docker-jackett
## 0.20.36 (18-11-2021)
- Update to latest version from linuxserver/docker-jackett
## 0.20.10 (17-11-2021)
- Update to latest version from linuxserver/docker-jackett
## 0.19.275 (16-11-2021)
- Update to latest version from linuxserver/docker-jackett
## 0.19.266 (15-11-2021)
- Update to latest version from linuxserver/docker-jackett
## 0.19.260 (14-11-2021)
- Update to latest version from linuxserver/docker-jackett
## 0.19.229 (13-11-2021)
- Update to latest version from linuxserver/docker-jackett
## 0.19.225 (11-11-2021)
- Update to latest version from linuxserver/docker-jackett
## 0.19.215 (09-11-2021)
- Update to latest version from linuxserver/docker-jackett
## 0.19.210 (08-11-2021)
- Update to latest version from linuxserver/docker-jackett
## 0.19.207 (07-11-2021)
- Update to latest version from linuxserver/docker-jackett
## 0.19.162 (05-11-2021)
- Update to latest version from linuxserver/docker-jackett
## 0.19.147 (05-11-2021)
- Update to latest version from linuxserver/docker-jackett
## 0.19.138 (03-11-2021)
- Update to latest version from linuxserver/docker-jackett
- Allow mounting local drives by label. Just pust the label instead of sda1 for example

2
jellyfin/CHANGELOG.md
View File

@@ -1,4 +1,4 @@
- Cleanup: config base folder changed to /config/addons_config
- Cleanup: config base folder changed to /config/addons_config (thanks @bruvv)
- New standardized logic for Dockerfile build and packages installation
- Add local mount (see readme)
- Added watchdog feature

7
jellyfin/rootfs/etc/cont-init.d/20-folders.sh
View File

@@ -24,12 +24,6 @@ if [ ! -d /share/jellyfin ]; then
chown -R abc:abc /share/jellyfin
fi
if [ ! -d /config/jellyfin ]; then
echo "Creating /config/jellyfin"
mkdir -p /config/jellyfin
chown -R abc:abc /config/jellyfin
fi
# links
if [ ! -d /jellyfin/cache ]; then
@@ -52,7 +46,6 @@ if [ ! -d /config/addons_config/jellyfin ]; then
chown -R abc:abc /config/addons_config/jellyfin
fi
if [ ! -d /jellyfin/data ]; then
echo "Creating link for /jellyfin/data"
mkdir -p /share/jellyfin/data

6
joal/CHANGELOG.md
View File

@@ -1,19 +1,23 @@
## 2.1.29 (23-12-2021)
- Update to latest version from anthonyraymond/joal
## 2.1.28 (14-12-2021)
- Update to latest version from anthonyraymond/joal
- New standardized logic for Dockerfile build and packages installation
## 2.1.27 (17-11-2021)
- Update to latest version from anthonyraymond/joal
## 2.1.26 (18-07-2021)
- Update to latest version from anthonyraymond/joal
- config exposed in /config/joal
## 2.1.24
- Update to latest version from anthonyraymond/joal
- Add ingress
- Add option for auto stop after x time

8
joal/rootfs/scripts/99-run.sh
View File

@@ -32,14 +32,14 @@ bashio::log.info "Joal updated"
##################
# If config doesn't exist, create it
if [ ! -f /config/joal/config.json ]; then
if [ ! -f /config/addon_config/joal/config.json ]; then
bashio::log.info "Symlinking config files"
mkdir -p /config/joal
cp /data/joal/config.json /config/joal/config.json
mkdir -p /config/addon_config/joal
cp /data/joal/config.json /config/addon_config/joal/config.json
fi
# Refresh symlink
ln -sf /config/joal/config.json /data/joal/config.json
ln -sf /config/addon_config/joal/config.json /data/joal/config.json
###############
# SET VARIABLES #

2
lidarr/CHANGELOG.md
View File

@@ -1,5 +1,5 @@
- Cleanup: config base folder changed to /config/addons_config (thanks @bruvv)
- New standardized logic for Dockerfile build and packages installation
- Allow mounting local drives by label. Just pust the label instead of sda1 for example
- Initial release
- Improve SMB mount code to v1.5 ; accepts several network disks separated by commas (//123.12.12.12/share,//123.12.12.12/hello) that are mount to /mnt/$sharename

4
lidarr/Dockerfile
View File

@@ -23,8 +23,8 @@ FROM ${BUILD_FROM}
RUN \
# use /data instead of /config for hass.io environment
sed -i "s|/config|/config/lidarr|g" /etc/services.d/lidarr/run \
&& sed -i "s|/config|/config/lidarr|g" /etc/cont-init.d/30-config \
sed -i "s|/config|/config/addons_config/lidarr|g" /etc/services.d/lidarr/run \
&& sed -i "s|/config|/config/addons_config/lidarr|g" /etc/cont-init.d/30-config \
\
# Allow UID and GID setting
&& sed -i 's/bash/bashio/g' /etc/cont-init.d/10-adduser \

13
lidarr/rootfs/etc/cont-init.d/20-folders.sh
View File

@@ -11,3 +11,16 @@ if [ ! -d /share/downloads ]; then
mkdir -p /share/downloads
chown -R abc:abc /share/downloads
fi
if [ -d /config/lidarr ]; then
echo "Moving to new location /config/addons_config/lidarr"
mkdir -p /config/addons_config/lidarr
chmod 777 /config/addons_config/lidarr
mv /config/lidarr/* /config/addons_config/lidarr/
fi
if [ ! -d /config/addons_config/lidarr ]; then
echo "Creating /config/addons_config/lidarr"
mkdir -p /config/addons_config/lidarr
chmod 777 /config/addons_config/lidarr
fi

2
nzbget/CHANGELOG.md
View File

@@ -1,4 +1,6 @@
- Cleanup: config base folder changed to /config/addons_config (thanks @bruvv)
## 21.1 (15-12-2021)
- Update to latest version from linuxserver/docker-nzbget
- Initial release (latest builds)

8
nzbget/Dockerfile
View File

@@ -21,15 +21,15 @@ FROM ${BUILD_FROM}
# 2 Modify Image #
##################
RUN sed -i "s|/config|/config/nzbget|g" /etc/services.d/nzbget/run \
&& sed -i "s|/config|/config/nzbget|g" /etc/cont-init.d/30-config \
&& sed -i "s|/config|/config/nzbget|g" /etc/cont-init.d/10-adduser \
RUN sed -i "s|/config|/config/addons_config/nzbget|g" /etc/services.d/nzbget/run \
&& sed -i "s|/config|/config/addons_config/nzbget|g" /etc/cont-init.d/30-config \
&& sed -i "s|/config|/config/addons_config/nzbget|g" /etc/cont-init.d/10-adduser \
# Allow UID and GID setting
&& sed -i 's/bash/bashio/g' /etc/cont-init.d/10-adduser \
&& sed -i 's/{PUID:-911}/(bashio::config "PUID")/g' /etc/cont-init.d/10-adduser \
&& sed -i 's/{PGID:-911}/(bashio::config "PGID")/g' /etc/cont-init.d/10-adduser \
# Create folder
&& sed -i '1a mkdir -p /config/nzbget' /etc/cont-init.d/10-adduser
&& sed -i '1a mkdir -p /config/addons_config/nzbget' /etc/cont-init.d/10-adduser
##################
# 3 Install apps #

16
nzbget/rootfs/etc/cont-init.d/20-folders.sh Normal file
View File

@@ -0,0 +1,16 @@
#!/usr/bin/with-contenv bash
slug=nzbget
if [ -d /config/$slug ]; then
echo "Moving to new location /config/addons_config/$slug"
mkdir -p /config/addons_config/$slug
chmod 777 /config/addons_config/$slug
mv /config/$slug/* /config/addons_config/$slug/
fi
if [ ! -d /config/addons_config/$slug ]; then
echo "Creating /config/addons_config/$slug"
mkdir -p /config/addons_config/$slug
chmod 777 /config/addons_config/$slug
fi

4
ombi/CHANGELOG.md
View File

@@ -1,11 +1,15 @@
- Cleanup: config base folder changed to /config/addons_config (thanks @bruvv)
- New standardized logic for Dockerfile build and packages installation
## 4.3.3 (07-11-2021)
- Update to latest version from linuxserver/docker-ombi
## 4.0.1468 (26-08-2021)
- Update to latest version from linuxserver/docker-ombi
## 4.0.1430 (25-07-2021)
- Update to latest version from linuxserver/docker-ombi
- Initial release

6
ombi/Dockerfile
View File

@@ -28,9 +28,9 @@ RUN \
&& sed -i 's/{PGID:-911}/(bashio::config "PGID")/g' /etc/cont-init.d/10-adduser \
\
# Correct config folder
&& grep -rl " /config" /etc/cont-init.d | xargs sed -i 's| /config| /config/ombi|g' || true \
&& grep -rl "/config" /etc/services.d | xargs sed -i 's|/config|/config/ombi|g' || true \
&& sed -i 's=/config/ombi=/config/ombi || true=g' /etc/cont-init.d/10-adduser || true
&& grep -rl " /config" /etc/cont-init.d | xargs sed -i 's| /config| /config/addons_config/ombi|g' || true \
&& grep -rl "/config" /etc/services.d | xargs sed -i 's|/config|/config/addons_config/ombi|g' || true \
&& sed -i 's=/config/ombi=/config/addons_config/ombi || true=g' /etc/cont-init.d/10-adduser || true
##################
# 3 Install apps #

16
ombi/rootfs/etc/cont-init.d/20-folders.sh Normal file
View File

@@ -0,0 +1,16 @@
#!/usr/bin/with-contenv bash
slug=ombi
if [ -d /config/$slug ]; then
echo "Moving to new location /config/addons_config/$slug"
mkdir -p /config/addons_config/$slug
chmod 777 /config/addons_config/$slug
mv /config/$slug/* /config/addons_config/$slug/
fi
if [ ! -d /config/addons_config/$slug ]; then
echo "Creating /config/addons_config/$slug"
mkdir -p /config/addons_config/$slug
chmod 777 /config/addons_config/$slug
fi

1
paperless_ng/CHANGELOG.md
View File

@@ -1,3 +1,4 @@
- Cleanup: config base folder changed to /config/addons_config (thanks @bruvv)
- MultiOCR: in OCRLANG field use comma separated value. Ex: fra,deu (working)
- Manual install pikepdf
- New standardized logic for Dockerfile build and packages installation

2
paperless_ng/Dockerfile
View File

@@ -21,7 +21,7 @@ FROM ${BUILD_FROM}
# 2 Modify Image #
##################
ENV PAPERLESS_DATA_DIR=/config/paperless_ng
ENV PAPERLESS_DATA_DIR=/config/addons_config/paperless_ng
RUN \
#################
# Correct image #

16
paperless_ng/rootfs/etc/cont-init.d/20-folders.sh Normal file
View File

@@ -0,0 +1,16 @@
#!/usr/bin/with-contenv bash
slug=paperless
if [ -d /config/$slug ]; then
echo "Moving to new location /config/addons_config/$slug"
mkdir -p /config/addons_config/$slug
chmod 777 /config/addons_config/$slug
mv /config/$slug/* /config/addons_config/$slug/
fi
if [ ! -d /config/addons_config/$slug ]; then
echo "Creating /config/addons_config/$slug"
mkdir -p /config/addons_config/$slug
chmod 777 /config/addons_config/$slug
fi

39
prowlarr/CHANGELOG.md
View File

@@ -1,115 +1,152 @@
- Cleanup: config base folder changed to /config/addons_config
- Cleanup: config base folder changed to /config/addons_config (thanks @bruvv)
## nightly-alpine-0.1.9.1313-ls2 (29-12-2021)
- Update to latest version from linuxserver/docker-prowlarr
## nightly-0.1.9.1276-ls237 (25-12-2021)
- Update to latest version from linuxserver/docker-prowlarr
## nightly-0.1.8.1269-ls234 (24-12-2021)
- Update to latest version from linuxserver/docker-prowlarr
## nightly-0.1.8.1265-ls233 (20-12-2021)
- Update to latest version from linuxserver/docker-prowlarr
## nightly-0.1.8.1259-ls230 (16-12-2021)
- Update to latest version from linuxserver/docker-prowlarr
## nightly-0.1.8.1253-ls229 (14-12-2021)
- Update to latest version from linuxserver/docker-prowlarr
## nightly-0.1.8.1238-ls228 (12-12-2021)
- Update to latest version from linuxserver/docker-prowlarr
- New standardized logic for Dockerfile build and packages installation
## nightly-0.1.8.1232-ls226 (10-12-2021)
- Update to latest version from linuxserver/docker-prowlarr
## nightly-0.1.8.1223-ls224 (09-12-2021)
- Update to latest version from linuxserver/docker-prowlarr
## nightly-0.1.8.1212-ls220 (07-12-2021)
- Update to latest version from linuxserver/docker-prowlarr
## nightly-0.1.8.1210-ls218 (07-12-2021)
- Update to latest version from linuxserver/docker-prowlarr
## develop-0.1.6.1184-ls30 (03-12-2021)
- Update to latest version from linuxserver/docker-prowlarr
## nightly-0.1.6.1177-ls210 (02-12-2021)
- Update to latest version from linuxserver/docker-prowlarr
## nightly-0.1.6.1176-ls209 (30-11-2021)
- Update to latest version from linuxserver/docker-prowlarr
## nightly-0.1.6.1165-ls205 (30-11-2021)
- Update to latest version from linuxserver/docker-prowlarr
## nightly-0.1.4.1147-ls196 (27-11-2021)
- Update to latest version from linuxserver/docker-prowlarr
## nightly-0.1.4.1145-ls195 (26-11-2021)
- Update to latest version from linuxserver/docker-prowlarr
## nightly-0.1.4.1143-ls194 (25-11-2021)
- Update to latest version from linuxserver/docker-prowlarr
## nightly-0.1.4.1139-ls192 (24-11-2021)
- Update to latest version from linuxserver/docker-prowlarr
## nightly-0.1.4.1133-ls190 (23-11-2021)
- Update to latest version from linuxserver/docker-prowlarr
## nightly-0.1.4.1130-ls189 (23-11-2021)
- Update to latest version from linuxserver/docker-prowlarr
## nightly-0.1.4.1126-ls187 (22-11-2021)
- Update to latest version from linuxserver/docker-prowlarr
## nightly-0.1.4.1120-ls186 (21-11-2021)
- Update to latest version from linuxserver/docker-prowlarr
## nightly-0.1.4.1117-ls184 (20-11-2021)
- Update to latest version from linuxserver/docker-prowlarr
## nightly-0.1.3.1113-ls183 (20-11-2021)
- Update to latest version from linuxserver/docker-prowlarr
## nightly-0.1.3.1102-ls178 (18-11-2021)
- Update to latest version from linuxserver/docker-prowlarr
## nightly-0.1.3.1089-ls176 (17-11-2021)
- Update to latest version from linuxserver/docker-prowlarr
## nightly-0.1.3.1077-ls175 (15-11-2021)
- Update to latest version from linuxserver/docker-prowlarr
## develop-0.1.2.1060-ls24 (13-11-2021)
- Update to latest version from linuxserver/docker-prowlarr
## nightly-0.1.2.1058-ls173 (11-11-2021)
- Update to latest version from linuxserver/docker-prowlarr
## nightly-0.1.2.1054-ls170 (09-11-2021)
- Update to latest version from linuxserver/docker-prowlarr
## nightly-0.1.2.1046-ls168 (07-11-2021)
- Update to latest version from linuxserver/docker-prowlarr
## nightly-0.1.2.1045-ls167 (05-11-2021)
- Update to latest version from linuxserver/docker-prowlarr
## nightly-0.1.2.1042-ls166 (31-10-2021)
- Update to latest version from linuxserver/docker-prowlarr
## nightly-0.1.2.1039-ls164 (29-10-2021)
- Update to latest version from linuxserver/docker-prowlarr
## nightly-0.1.2.1037-ls163 (28-10-2021)
- Update to latest version from linuxserver/docker-prowlarr
## nightly-0.1.1.1030-ls162 (26-10-2021)
- Update to latest version from linuxserver/docker-prowlarr
- Improve SMB mount code to v1.5 ; accepts several network disks separated by commas (//123.12.12.12/share,//123.12.12.12/hello) that are mount to /mnt/$sharename

1
qbittorrent/CHANGELOG.md
View File

@@ -1,3 +1,4 @@
- Cleanup: config base folder changed to /config/addons_config (thanks @bruvv)
- Removed watchdog
- New standardized logic for Dockerfile build and packages installation
- Allow mounting nvme

4
qbittorrent/Dockerfile
View File

@@ -37,8 +37,8 @@ RUN \
&& sed -i 's/{PGID:-911}/(bashio::config "PGID")/g' /etc/cont-init.d/10-adduser \
\
# Correct permissions
&& sed -i 's=/config=/config/qBittorrent || true=g' /etc/cont-init.d/10-adduser \
&& sed -i 's= /config=/config/qBittorrent || true=g' /etc/cont-init.d/30-config \
&& sed -i 's=/config=/config/addons_config/qBittorrent || true=g' /etc/cont-init.d/10-adduser \
&& sed -i 's= /config=/config/addons_config/qBittorrent || true=g' /etc/cont-init.d/30-config \
\
# Set download folder to /share
&& sed -i 's|/downloads/|/share/qBittorrent/|g' /defaults/qBittorrent.conf \

16
qbittorrent/rootfs/etc/cont-init.d/20-folders.sh Normal file
View File

@@ -0,0 +1,16 @@
#!/usr/bin/with-contenv bash
slug=qBittorrent
if [ -d /config/$slug ]; then
echo "Moving to new location /config/addons_config/$slug"
mkdir -p /config/addons_config/$slug
chmod 777 /config/addons_config/$slug
mv /config/$slug/* /config/addons_config/$slug/
fi
if [ ! -d /config/addons_config/$slug ]; then
echo "Creating /config/addons_config/$slug"
mkdir -p /config/addons_config/$slug
chmod 777 /config/addons_config/$slug
fi

22
qbittorrent/rootfs/etc/cont-init.d/91-qbittorrent_configuration.sh
View File

@@ -5,7 +5,7 @@
##########
# Define preferences line
cd /config/qBittorrent/
cd /config/addon_config/qBittorrent/
LINE=$(sed -n '/Preferences/=' qBittorrent.conf)
LINE=$((LINE + 1))
@@ -19,7 +19,7 @@ if bashio::config.has_value 'run_duration'; then
chmod +x /etc/services.d/qbittorrent/run
else
rm /etc/services.d/qbittorrent/timer
fi
fi
##################
# Default folder #
@@ -59,7 +59,7 @@ if bashio::config.true 'ssl'; then
#set variables
CERTFILE=$(bashio::config 'certfile')
KEYFILE=$(bashio::config 'keyfile')
#Modify configuration
sed -i "$LINE i\WebUI\\\HTTPS\\\Enabled=True" qBittorrent.conf
sed -i "$LINE i\WebUI\\\HTTPS\\\CertificatePath=/ssl/$CERTFILE" qBittorrent.conf
@@ -70,7 +70,7 @@ fi
# WHITELIST #
################
cd /config/qBittorrent/
cd /config/addon_config/qBittorrent/
if bashio::config.has_value 'whitelist'; then
WHITELIST=$(bashio::config 'whitelist')
#clean data
@@ -84,7 +84,7 @@ fi
# USERNAME #
###############
cd /config/qBittorrent/
cd /config/addon_config/qBittorrent/
if bashio::config.has_value 'Username'; then
USERNAME=$(bashio::config 'Username')
#clean data
@@ -112,7 +112,7 @@ if bashio::config.has_value 'customUI'; then
### Download WebUI
case $CUSTOMUI in
"vuetorrent")
"vuetorrent")
curl -s -S -J -L -o /webui/release.zip $(curl -s https://api.github.com/repos/WDaan/VueTorrent/releases/latest | grep -o "http.*vuetorrent.zip") >/dev/null
;;
@@ -131,11 +131,11 @@ if bashio::config.has_value 'customUI'; then
rm /webui/*.zip
CUSTOMUIDIR="$(dirname "$(find /webui/$CUSTOMUI -iname "public" -type d)")"
# Set qbittorrent
sed -i "$LINE i\WebUI\\\AlternativeUIEnabled=true" /config/qBittorrent/qBittorrent.conf
sed -i "$LINE i\WebUI\\\RootFolder=$CUSTOMUIDIR" /config/qBittorrent/qBittorrent.conf
sed -i "$LINE i\WebUI\\\AlternativeUIEnabled=true" /config/addon_config/qBittorrent/qBittorrent.conf
sed -i "$LINE i\WebUI\\\RootFolder=$CUSTOMUIDIR" /config/addon_config/qBittorrent/qBittorrent.conf
# Set nginx
#sed -i "s=/vuetorrent/public/=$CUSTOMUIDIR/public/=g" /etc/nginx/servers/ingress.conf
#sed -i "s=vue.torrent=$CUSTOMUI.torrent=g" /etc/nginx/servers/ingress.conf
#sed -i "s=/vuetorrent/public/=$CUSTOMUIDIR/public/=g" /etc/nginx/servers/ingress.conf
#sed -i "s=vue.torrent=$CUSTOMUI.torrent=g" /etc/nginx/servers/ingress.conf
fi
@@ -144,4 +144,4 @@ fi
##########
bashio::log.info "Default username/password : admin/adminadmin"
bashio::log.info "Configuration can be found in /config/qBittorrent"
bashio::log.info "Configuration can be found in /config/addon_config/qBittorrent"

58
qbittorrent/rootfs/etc/cont-init.d/93-openvpn.sh
View File

@@ -6,28 +6,28 @@ declare openvpn_username
declare openvpn_password
if bashio::config.true 'openvpn_enabled'; then
bashio::log.info "Configuring openvpn"
#####################
# CONFIGURE OPENVPN #
#####################
openvpn_config=$(bashio::config 'openvpn_config')
cp "/config/openvpn/${openvpn_config}" /etc/openvpn/config.ovpn || bashio::log.error "openvpn config file not found in /config/openvpn/${openvpn_config}"
cp "/config/openvpn/${openvpn_config}" /etc/openvpn/config.ovpn || bashio::log.error "openvpn config file not found in /config/openvpn/${openvpn_config}"
openvpn_username=$(bashio::config 'openvpn_username')
echo "${openvpn_username}" > /etc/openvpn/credentials
echo "${openvpn_username}" >/etc/openvpn/credentials
openvpn_password=$(bashio::config 'openvpn_password')
echo "${openvpn_password}" >> /etc/openvpn/credentials
echo "${openvpn_password}" >>/etc/openvpn/credentials
sed -i 's/auth-user-pass.*/auth-user-pass \/etc\/openvpn\/credentials/g' /etc/openvpn/config.ovpn
# Permissions
chmod 600 /etc/openvpn/credentials
chmod 755 /etc/openvpn/up.sh
chmod 755 /etc/openvpn/down.sh
chmod 755 /etc/openvpn/up-qbittorrent.sh
chmod 755 /etc/openvpn/up-qbittorrent.sh
chmod +x /etc/openvpn/up.sh
chmod +x /etc/openvpn/up-qbittorrent.sh
@@ -36,24 +36,24 @@ if bashio::config.true 'openvpn_enabled'; then
#########################
# CONFIGURE QBITTORRENT #
#########################
QBT_CONFIG_FILE="/config/qBittorrent/qBittorrent.conf"
QBT_CONFIG_FILE="/config/addon_config/qBittorrent/qBittorrent.conf"
# Define preferences line
cd /config/qBittorrent/
cd /config/addon_config/qBittorrent/
LINE=$(sed -n '/Preferences/=' qBittorrent.conf)
LINE=$((LINE + 1))
# If qBittorrent.conf exists
if [ -f "$QBT_CONFIG_FILE" ]; then
# Remove previous line and bind tun0
sed -i '/Interface/d' qBittorrent.conf
# sed -i '/PortRangeMin/d' qBittorrent.conf
# Bind tun0
# sed -i "$LINE i\Connection\\\Interface=tun0" qBittorrent.conf
# sed -i "$LINE i\Connection\\\InterfaceName=tun0" qBittorrent.conf
if [ -f "$QBT_CONFIG_FILE" ]; then
# Remove previous line and bind tun0
sed -i '/Interface/d' qBittorrent.conf
# sed -i '/PortRangeMin/d' qBittorrent.conf
# Bind tun0
# sed -i "$LINE i\Connection\\\Interface=tun0" qBittorrent.conf
# sed -i "$LINE i\Connection\\\InterfaceName=tun0" qBittorrent.conf
else
bashio::log.error "qBittorrent config file doesn't exist, openvpn must be added manually to qbittorrent options "
exit 1
bashio::log.error "qBittorrent config file doesn't exist, openvpn must be added manually to qbittorrent options "
exit 1
fi
#####################
@@ -61,13 +61,13 @@ if bashio::config.true 'openvpn_enabled'; then
#####################
if bashio::config.true 'openvpn_alternative_mode'; then
# Remove previous line and bind tun0
sed -i '/Interface/d' qBittorrent.conf
# Bind tun0
sed -i "$LINE i\Connection\\\Interface=tun0" qBittorrent.conf
sed -i "$LINE i\Connection\\\InterfaceName=tun0" qBittorrent.conf
# Modify ovpn config
echo "route-nopull" >> /etc/openvpn/config.ovpn
# Remove previous line and bind tun0
sed -i '/Interface/d' qBittorrent.conf
# Bind tun0
sed -i "$LINE i\Connection\\\Interface=tun0" qBittorrent.conf
sed -i "$LINE i\Connection\\\InterfaceName=tun0" qBittorrent.conf
# Modify ovpn config
echo "route-nopull" >>/etc/openvpn/config.ovpn
fi
else
@@ -76,8 +76,8 @@ else
# REMOVE OPENVPN #
##################
# Ensure no redirection by removing the direction tag
cd /config/qBittorrent/
sed -i '/Interface/d' qBittorrent.conf
cd /config/addon_config/qBittorrent/
sed -i '/Interface/d' qBittorrent.conf
bashio::log.info "Direct connection without VPN enabled"
fi

2
radarr/CHANGELOG.md
View File

@@ -1,4 +1,4 @@
- Cleanup: config base folder changed to /config/addons_config
- Cleanup: config base folder changed to /config/addons_config (thanks @bruvv)
- New standardized logic for Dockerfile build and packages installation
- Allow mounting local drives by label. Just pust the label instead of sda1 for example
- Improve SMB mount code to v1.5 ; accepts several network disks separated by commas (//123.12.12.12/share,//123.12.12.12/hello) that are mount to /mnt/$sharename

26
readarr/CHANGELOG.md
View File

@@ -1,77 +1,101 @@
- Cleanup: config base folder changed to /config/addons_config
- Cleanup: config base folder changed to /config/addons_config (thanks @bruvv)
## nightly-0.1.0.1149-ls59 (28-12-2021)
- Update to latest version from linuxserver/docker-readarr
## nightly-0.1.0.1144-ls58 (25-12-2021)
- Update to latest version from linuxserver/docker-readarr
## nightly-0.1.0.1142-ls56 (20-12-2021)
- Update to latest version from linuxserver/docker-readarr
## nightly-0.1.0.1137-ls55 (18-12-2021)
- Update to latest version from linuxserver/docker-readarr
## nightly-0.1.0.1133-ls54 (16-12-2021)
- Update to latest version from linuxserver/docker-readarr
## nightly-0.1.0.1126-ls53 (16-12-2021)
- Update to latest version from linuxserver/docker-readarr
## nightly-0.1.0.1117-ls52 (12-12-2021)
- Update to latest version from linuxserver/docker-readarr
- New standardized logic for Dockerfile build and packages installation
- Allow to define the config location
## nightly-0.1.0.1095-ls51 (09-12-2021)
- Update to latest version from linuxserver/docker-readarr
## nightly-0.1.0.1092-ls50 (09-12-2021)
- Update to latest version from linuxserver/docker-readarr
## nightly-0.1.0.1085-ls49 (07-12-2021)
- Update to latest version from linuxserver/docker-readarr
## nightly-0.1.0.1083-ls48 (03-12-2021)
- Update to latest version from linuxserver/docker-readarr
## nightly-0.1.0.1081-ls46 (03-12-2021)
- Update to latest version from linuxserver/docker-readarr
## nightly-0.1.0.1072-ls42 (02-12-2021)
- Update to latest version from linuxserver/docker-readarr
## nightly-0.1.0.1071-ls41 (30-11-2021)
- Update to latest version from linuxserver/docker-readarr
## nightly-0.1.0.1060-ls39 (24-11-2021)
- Update to latest version from linuxserver/docker-readarr
## nightly-0.1.0.1054-ls37 (24-11-2021)
- Update to latest version from linuxserver/docker-readarr
## nightly-0.1.0.1053-ls36 (23-11-2021)
- Update to latest version from linuxserver/docker-readarr
## nightly-0.1.0.1050-ls35 (20-11-2021)
- Update to latest version from linuxserver/docker-readarr
## nightly-0.1.0.1041-ls34 (17-11-2021)
- Update to latest version from linuxserver/docker-readarr
## nightly-0.1.0.1035-ls33 (15-11-2021)
- Update to latest version from linuxserver/docker-readarr
## nightly-0.1.0.1024-ls29 (14-11-2021)
- Update to latest version from linuxserver/docker-readarr
## nightly-0.1.0.1019-ls28 (13-11-2021)
- Update to latest version from linuxserver/docker-readarr
## nightly-0.1.0.1011-ls25 (11-11-2021)
- Update to latest version from linuxserver/docker-readarr
## nightly-0.1.0.1006-ls24 (07-11-2021)
- Update to latest version from linuxserver/docker-readarr
- Allow mounting local drives by label. Just pust the label instead of sda1 for example

1
resiliosync/CHANGELOG.md
View File

@@ -1,3 +1,4 @@
- Cleanup: config base folder changed to /config/addons_config (thanks @bruvv)
- New standardized logic for Dockerfile build and packages installation
- Add local & smb mounts (see readme)
- Config changed from /config/resiliosync to /share/resiliosync_config

2
sonarr/CHANGELOG.md
View File

@@ -1,4 +1,4 @@
- Cleanup: config base folder changed to /config/addons_config
- Cleanup: config base folder changed to /config/addons_config (thanks @bruvv)
- New standardized logic for Dockerfile build and packages installation
- Allow mounting local drives by label. Just pust the label instead of sda1 for example
- Allow mounting local drives by label. Just pust the label instead of sda1 for example

2
ubooquity/rootfs/etc/32-nginx_ingress.sh
View File

@@ -16,7 +16,7 @@ if [ $port > 1 ]; then
sed -i "s|%%port%%|$port|g" /etc/nginx/servers/ingress.conf
sed -i "s|%%interface%%|$(bashio::addon.ip_address)|g" /etc/nginx/servers/ingress.conf
# Removebaseurl
jq '.reverseProxyPrefix = ""' /config/ubooquity/preferences.json | sponge /config/ubooquity/preferences.json
jq '.reverseProxyPrefix = ""' /config/addon_config/ubooquity/preferences.json | sponge /config/addon_config/ubooquity/preferences.json
# Log
bashio::log.info "Ingress enabled"
else

16
ubooquity/rootfs/etc/cont-init.d/20-folders.sh Normal file
View File

@@ -0,0 +1,16 @@
#!/usr/bin/with-contenv bash
slug=ubooquity
if [ -d /config/$slug ]; then
echo "Moving to new location /config/addons_config/$slug"
mkdir -p /config/addons_config/$slug
chmod 777 /config/addons_config/$slug
mv /config/$slug/* /config/addons_config/$slug/
fi
if [ ! -d /config/addons_config/$slug ]; then
echo "Creating /config/addons_config/$slug"
mkdir -p /config/addons_config/$slug
chmod 777 /config/addons_config/$slug
fi

10
ubooquity/rootfs/etc/cont-init.d/91-configuration.sh
View File

@@ -3,9 +3,9 @@
###########
# FOLDERS #
###########
FILES=$(jq ".filesPaths[0].pathString" /config/ubooquity/preferences.json)
COMICS=$(jq ".comicsPaths[0].pathString" /config/ubooquity/preferences.json)
BOOKS=$(jq ".booksPaths[0].pathString" /config/ubooquity/preferences.json)
FILES=$(jq ".filesPaths[0].pathString" /config/addon_config/ubooquity/preferences.json)
COMICS=$(jq ".comicsPaths[0].pathString" /config/addon_config/ubooquity/preferences.json)
BOOKS=$(jq ".booksPaths[0].pathString" /config/addon_config/ubooquity/preferences.json)
mkdir -p $FILES $COMICS $BOOKS /config/ubooquity || true
chown -R abc:abc $FILES $COMICS $BOOKS /config/ubooquity || true
mkdir -p $FILES $COMICS $BOOKS /config/addon_config/ubooquity || true
chown -R abc:abc $FILES $COMICS $BOOKS /config/addon_config/ubooquity || true

8
ubooquity/rootfs/etc/cont-init.d/93-custom_webUI.sh
View File

@@ -13,13 +13,13 @@ if bashio::config.has_value 'theme'; then
case $CUSTOMUI in
"comixology2")
curl -s -S -J -L -o /data/release.zip https://github.com/scooterpsu/Comixology_Ubooquity_2/releases/download/v3.4/comixology2.zip >/dev/null &&
unzip -o -q /data/release.zip -d /config/ubooquity/themes/
unzip -o -q /data/release.zip -d /config/addon_config/ubooquity/themes/
;;
"plextheme-master")
curl -s -S -J -L -o /data/release.zip https://github.com/FinalAngel/plextheme/archive/master.zip >/dev/null &&
unzip -q /data/release.zip -d /config/ubooquity/themes/
# && mv /config/ubooquity/themes/plextheme-master/ /config/ubooquity/themes/
unzip -q /data/release.zip -d /config/addon_config/ubooquity/themes/
# && mv /config/addon_config/ubooquity/themes/plextheme-master/ /config/addon_config/ubooquity/themes/
;;
esac
@@ -28,6 +28,6 @@ if bashio::config.has_value 'theme'; then
rm /data/release.zip || true
### Set preference
jq --arg variable $CUSTOMUI '.theme = $variable' /config/ubooquity/preferences.json | sponge /config/ubooquity/preferences.json
jq --arg variable $CUSTOMUI '.theme = $variable' /config/addon_config/ubooquity/preferences.json | sponge /config/addon_config/ubooquity/preferences.json
fi