This commit is contained in:
Alexandre
2022-11-02 17:39:48 +01:00
166 changed files with 879 additions and 551 deletions

10
.github/linters/.gitleaks.toml vendored Normal file
View File

@@ -0,0 +1,10 @@
title = "gitleaks config"
[extend]
# useDefault will extend the base configuration with the default gitleaks config:
# https://github.com/zricethezav/gitleaks/blob/master/config/gitleaks.toml
useDefault = false
[allowlist]
description = "global allowlist. whitelisting paths"
paths = ['''/github/workspace/epicgamesfree/templates/config.json''']

View File

@@ -40,7 +40,7 @@ else
fi
# Need to restart
bashio::log.fatal "Config file not found, creating a new one. Please customize the file in $CONFIGSOURCE before restarting."
# bashio::exit.nok
bashio::addon.stop
fi
# Permissions

View File

@@ -44,7 +44,8 @@ if bashio::config.has_value 'localdisks'; then
[ -d /share/"$disk" ] && mount "$devpath"/"$disk" /share/"$disk" || true
# Mount
# shellcheck disable=SC2015
mount "$devpath"/"$disk" -o "uid=$PUID,gid=$PGID" /mnt/"$disk" && bashio::log.info "Success! $disk mounted to /mnt/$disk" || (bashio::log.fatal "Unable to mount local drives! Please check the name." && rmdir /mnt/$disk)
mount "$devpath"/"$disk" -o "uid=$PUID,gid=$PGID" /mnt/"$disk" && bashio::log.info "Success! $disk mounted to /mnt/$disk" || \
mount "$devpath"/"$disk" /mnt/"$disk" && bashio::log.info "Success! $disk mounted to /mnt/$disk" && bashio::log.info "Success! $disk mounted to /mnt/$disk" || (bashio::log.fatal "Unable to mount local drives! Please check the name." && rmdir /mnt/$disk)
done

View File

@@ -75,7 +75,7 @@ If you want to do add the repository manually, please follow the procedure highl
![Update](https://img.shields.io/badge/dynamic/json?label=Updated&query=%24.last_update&url=https%3A%2F%2Fraw.githubusercontent.com%2Falexbelgium%2Fhassio-addons%2Fmaster%2Fcalibre%2Fupdater.json)
![aarch64][aarch64-badge]
![amd64][amd64-badge]
![armv7no][armv7no-badge]
![armv7][armv7-badge]
![ingress][ingress-badge]
![smb][smb-badge]
![localdisks][localdisks-badge]
@@ -148,7 +148,7 @@ If you want to do add the repository manually, please follow the procedure highl
![armv7][armv7-badge]
![mqtt][mqtt-badge]
✓ [Epic Games Free](epicgamesfree/) : Automatically login and redeem promotional free games from the Epic Games Store
✓ [Epic Games Free](epicgamesfree/) : Automatically login and redeem promotional free games from Epic Games Store
  ![Version](https://img.shields.io/badge/dynamic/json?label=Version&query=%24.version&url=https%3A%2F%2Fraw.githubusercontent.com%2Falexbelgium%2Fhassio-addons%2Fmaster%2Fepicgamesfree%2Fconfig.json)
![Update](https://img.shields.io/badge/dynamic/json?label=Updated&query=%24.last_update&url=https%3A%2F%2Fraw.githubusercontent.com%2Falexbelgium%2Fhassio-addons%2Fmaster%2Fepicgamesfree%2Fupdater.json)
@@ -625,7 +625,7 @@ If you want to do add the repository manually, please follow the procedure highl
![Update](https://img.shields.io/badge/dynamic/json?label=Updated&query=%24.last_update&url=https%3A%2F%2Fraw.githubusercontent.com%2Falexbelgium%2Fhassio-addons%2Fmaster%2Funpackerr%2Fupdater.json)
![aarch64][aarch64-badge]
![amd64][amd64-badge]
![armv7][armv7-badge]
![armv7no][armv7no-badge]
✓ [Vaultwarden (Bitwarden)](bitwarden/) : Open source password management solution

View File

@@ -30,22 +30,22 @@ ENV S6_CMD_WAIT_FOR_SERVICES=1 \
# Global LSIO modifications
ARG CONFIGLOCATION="/config/addons_config/bazarr"
# hadolint ignore=SC2015, SC2013
# hadolint ignore=SC2015, SC2013, SC2086, SC2086
RUN \
# Avoid custom-init.d duplications
for file in $(grep -sril 'Potential tampering with custom' /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do rm -f "$file"; done \
for file in $(grep -sril 'Potential tampering with custom' /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do rm -f $file; done \
\
# Create new config folder if needed
&& for file in $(grep -srl "PUID" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" "$file"; done \
&& for file in $(grep -srl "PUID" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" $file; done \
\
# Allow UID and GID setting
&& for file in $(grep -srl "PUID" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' "$file" && sed -i '1a PUID="$(if bashio::config.has_value "PUID"; then bashio::config "PUID"; else echo "0"; fi)"' "$file" && sed -i '1a PGID="$(if bashio::config.has_value "PGID"; then bashio::config "PGID"; else echo "0"; fi)"' "$file"; done \
&& for file in $(grep -srl "PUID" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' $file && sed -i '1a PUID="$(if bashio::config.has_value "PUID"; then bashio::config "PUID"; else echo "0"; fi)"' $file && sed -i '1a PGID="$(if bashio::config.has_value "PGID"; then bashio::config "PGID"; else echo "0"; fi)"' $file; done \
\
# Correct config location
&& for file in $(grep -Esril "/config[ '\"/]|/config\$" /etc/logrotate.d /defaults /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do sed -Ei "s=(/config)+(/| |$|\"|\')=$CONFIGLOCATION\2=g" "$file"; done \
&& for file in $(grep -Esril "/config[ '\"/]|/config\$" /etc /defaults); do sed -Ei "s=(/config)+(/| |$|\"|\')=$CONFIGLOCATION\2=g" $file; done \
\
# Avoid chmod /config
&& for files in /etc/services.d/*/* /etc/cont-init.d/* /etc/s6-overlay/s6-rc.d/*/*;do if [ -f $files ] && [[ ! -z $(awk '/chown.*abc:abc.*\\/,/.*\/config( |$)/{print FILENAME}' "$files") ]] ; then sed -i "s|/config$|/data|g" "$files"; fi ;done
&& for file in /etc/services.d/*/* /etc/cont-init.d/* /etc/s6-overlay/s6-rc.d/*/*;do if [ -f $files ] && [[ ! -z $(awk '/chown.*abc:abc.*\\/,/.*\/config( |$)/{print FILENAME}' $file) ]] ; then sed -i "s|/config$|/data|g" $file; fi ;done
##################
# 3 Install apps #

View File

@@ -1,7 +1,6 @@
# Home assistant add-on: Vaultwarden (Bitwarden RS)
IT IS RECOMMENDED TO USE THE OFFICIAL ADDON (https://github.com/hassio-addons/addon-bitwarden) INSTEAD OF THIS FORK.
THE ONLY BENEFIT OF THIS FORK IS AUTOMATED RELEASES, NOW IMPLEMENTED IN THE OFFICAL ONE.
# ⚠️ It is recommended to use the official addon (https://github.com/hassio-addons/addon-bitwarden) instead of this fork. The only benefit of this fork is automated releases, now implemented in the offical one. ⚠️
[![Donate][donation-badge]](https://www.buymeacoffee.com/alexbelgium)
@@ -17,7 +16,6 @@ THE ONLY BENEFIT OF THIS FORK IS AUTOMATED RELEASES, NOW IMPLEMENTED IN THE OFFI
_Thanks to everyone having starred my repo! To star it click on the image below, then it will be on top right. Thanks!_
[![Stargazers repo roster for @alexbelgium/hassio-addons](https://git-lister.onrender.com/api/stars/alexbelgium/hassio-addons?limit=30)](https://github.com/alexbelgium/hassio-addons/stargazers)
## About

View File

@@ -1,4 +1,7 @@
## v2201.1.0-ls72 (01-11-2022)
- Update to latest version from linuxserver/docker-booksonic-air
## v2201.1.0-ls71 (18-10-2022)
- Update to latest version from linuxserver/docker-booksonic-air

View File

@@ -32,22 +32,22 @@ ENV BOOKSONIC_AIR_SETTINGS="/data"
# Global LSIO modifications
ARG CONFIGLOCATION="/data"
# hadolint ignore=SC2015, SC2013
# hadolint ignore=SC2015, SC2013, SC2086
RUN \
# Avoid custom-init.d duplications
for file in $(grep -sril 'Potential tampering with custom' /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do rm -f "$file"; done \
for file in $(grep -sril 'Potential tampering with custom' /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do rm -f $file; done \
\
# Create new config folder if needed
&& for file in $(grep -srl "PUID" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" "$file"; done \
&& for file in $(grep -srl "PUID" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" $file; done \
\
# Allow UID and GID setting
&& for file in $(grep -srl "PUID" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' "$file" && sed -i '1a PUID="$(if bashio::config.has_value "PUID"; then bashio::config "PUID"; else echo "0"; fi)"' "$file" && sed -i '1a PGID="$(if bashio::config.has_value "PGID"; then bashio::config "PGID"; else echo "0"; fi)"' "$file"; done \
&& for file in $(grep -srl "PUID" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' $file && sed -i '1a PUID="$(if bashio::config.has_value "PUID"; then bashio::config "PUID"; else echo "0"; fi)"' $file && sed -i '1a PGID="$(if bashio::config.has_value "PGID"; then bashio::config "PGID"; else echo "0"; fi)"' $file; done \
\
# Correct config location
&& for file in $(grep -Esril "/config[ '\"/]|/config\$" /etc/logrotate.d /defaults /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do sed -Ei "s=(/config)+(/| |$|\"|\')=$CONFIGLOCATION\2=g" "$file"; done \
&& for file in $(grep -Esril "/config[ '\"/]|/config\$" /etc /defaults); do sed -Ei "s=(/config)+(/| |$|\"|\')=$CONFIGLOCATION\2=g" $file; done \
\
# Avoid chmod /config
&& for files in /etc/services.d/*/* /etc/cont-init.d/* /etc/s6-overlay/s6-rc.d/*/*;do if [ -f $files ] && [[ ! -z $(awk '/chown.*abc:abc.*\\/,/.*\/config( |$)/{print FILENAME}' "$files") ]] ; then sed -i "s|/config$|/data|g" "$files"; fi ;done
&& for file in /etc/services.d/*/* /etc/cont-init.d/* /etc/s6-overlay/s6-rc.d/*/*;do if [ -f $files ] && [[ ! -z $(awk '/chown.*abc:abc.*\\/,/.*\/config( |$)/{print FILENAME}' $file) ]] ; then sed -i "s|/config$|/data|g" $file; fi ;done
##################
# 3 Install apps #

View File

@@ -78,6 +78,6 @@
},
"slug": "booksonic-air_nas",
"url": "https://github.com/alexbelgium/hassio-addons/tree/master/booksonic_air",
"version": "v2201.1.0-ls71",
"version": "v2201.1.0-ls72",
"webui": "[PROTO:ssl]://[HOST]:[PORT:4040]"
}

View File

@@ -1,9 +1,9 @@
{
"github_fulltag": "true",
"last_update": "18-10-2022",
"last_update": "01-11-2022",
"repository": "alexbelgium/hassio-addons",
"slug": "booksonic_air",
"source": "github",
"upstream_repo": "linuxserver/docker-booksonic-air",
"upstream_version": "v2201.1.0-ls71"
"upstream_version": "v2201.1.0-ls72"
}

View File

@@ -1,4 +1,13 @@
## v6.7.1-ls190 (01-11-2022)
- Update to latest version from linuxserver/docker-calibre
## v6.7.1-ls189 (25-10-2022)
- Update to latest version from linuxserver/docker-calibre
## v6.7.1-ls188 (20-10-2022)
- Update to latest version from linuxserver/docker-calibre
## v6.7.1-ls186 (18-10-2022)
- Update to latest version from linuxserver/docker-calibre

View File

@@ -31,22 +31,22 @@ ENV S6_CMD_WAIT_FOR_SERVICES=1 \
# Global LSIO modifications
ARG CONFIGLOCATION="/config/addons_config/calibre"
# hadolint ignore=SC2015, SC2013
# hadolint ignore=SC2015, SC2013, SC2086
RUN \
# Avoid custom-init.d duplications
for file in $(grep -sril 'Potential tampering with custom' /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do rm -f "$file"; done \
for file in $(grep -sril 'Potential tampering with custom' /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do rm -f $file; done \
\
# Create new config folder if needed
&& for file in $(grep -srl "PUID" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" "$file"; done \
&& for file in $(grep -srl "PUID" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" $file; done \
\
# Allow UID and GID setting
&& for file in $(grep -srl "PUID" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' "$file" && sed -i '1a PUID="$(if bashio::config.has_value "PUID"; then bashio::config "PUID"; else echo "0"; fi)"' "$file" && sed -i '1a PGID="$(if bashio::config.has_value "PGID"; then bashio::config "PGID"; else echo "0"; fi)"' "$file"; done \
&& for file in $(grep -srl "PUID" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' $file && sed -i '1a PUID="$(if bashio::config.has_value "PUID"; then bashio::config "PUID"; else echo "0"; fi)"' $file && sed -i '1a PGID="$(if bashio::config.has_value "PGID"; then bashio::config "PGID"; else echo "0"; fi)"' $file; done \
\
# Correct config location
&& for file in $(grep -Esril "/config[ '\"/]|/config\$" /etc/logrotate.d /defaults /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do sed -Ei "s=(/config)+(/| |$|\"|\')=$CONFIGLOCATION\2=g" "$file"; done \
&& for file in $(grep -Esril "/config[ '\"/]|/config\$" /etc /defaults); do sed -Ei "s=(/config)+(/| |$|\"|\')=$CONFIGLOCATION\2=g" $file; done \
\
# Avoid chmod /config
&& for files in /etc/services.d/*/* /etc/cont-init.d/* /etc/s6-overlay/s6-rc.d/*/*;do if [ -f $files ] && [[ ! -z $(awk '/chown.*abc:abc.*\\/,/.*\/config( |$)/{print FILENAME}' "$files") ]] ; then sed -i "s|/config$|/data|g" "$files"; fi ;done
&& for file in /etc/services.d/*/* /etc/cont-init.d/* /etc/s6-overlay/s6-rc.d/*/*;do if [ -f $files ] && [[ ! -z $(awk '/chown.*abc:abc.*\\/,/.*\/config( |$)/{print FILENAME}' $file) ]] ; then sed -i "s|/config$|/data|g" $file; fi ;done
# Specific images modifications
RUN \

View File

@@ -89,6 +89,6 @@
},
"slug": "calibre",
"url": "https://github.com/alexbelgium/hassio-addons/tree/master/calibre",
"version": "v6.7.1-ls186",
"version": "v6.7.1-ls190",
"video": true
}

View File

@@ -1,10 +1,10 @@
{
"github_fulltag": "true",
"last_update": "18-10-2022",
"last_update": "01-11-2022",
"paused": false,
"repository": "alexbelgium/hassio-addons",
"slug": "calibre",
"source": "github",
"upstream_repo": "linuxserver/docker-calibre",
"upstream_version": "v6.7.1-ls186"
"upstream_version": "v6.7.1-ls190"
}

View File

@@ -1,4 +1,16 @@
## 0.6.19-ls182 (02-11-2022)
- Update to latest version from linuxserver/docker-calibre-web
## 0.6.19-ls181 (27-10-2022)
- Update to latest version from linuxserver/docker-calibre-web
## 0.6.19-ls180 (25-10-2022)
- Update to latest version from linuxserver/docker-calibre-web
## 0.6.19-ls179 (20-10-2022)
- Update to latest version from linuxserver/docker-calibre-web
## 0.6.19-ls178 (13-10-2022)
- Update to latest version from linuxserver/docker-calibre-web

View File

@@ -31,22 +31,22 @@ ENV S6_CMD_WAIT_FOR_SERVICES=1 \
# Global LSIO modifications
ARG CONFIGLOCATION="/config/addons_config/calibre-web"
# hadolint ignore=SC2015, SC2013
# hadolint ignore=SC2015, SC2013, SC2086
RUN \
# Avoid custom-init.d duplications
for file in $(grep -sril 'Potential tampering with custom' /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do rm -f "$file"; done \
for file in $(grep -sril 'Potential tampering with custom' /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do rm -f $file; done \
\
# Create new config folder if needed
&& for file in $(grep -srl "PUID" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" "$file"; done \
&& for file in $(grep -srl "PUID" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" $file; done \
\
# Allow UID and GID setting
&& for file in $(grep -srl "PUID" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' "$file" && sed -i '1a PUID="$(if bashio::config.has_value "PUID"; then bashio::config "PUID"; else echo "0"; fi)"' "$file" && sed -i '1a PGID="$(if bashio::config.has_value "PGID"; then bashio::config "PGID"; else echo "0"; fi)"' "$file"; done \
&& for file in $(grep -srl "PUID" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' $file && sed -i '1a PUID="$(if bashio::config.has_value "PUID"; then bashio::config "PUID"; else echo "0"; fi)"' $file && sed -i '1a PGID="$(if bashio::config.has_value "PGID"; then bashio::config "PGID"; else echo "0"; fi)"' $file; done \
\
# Correct config location
&& for file in $(grep -Esril "/config[ '\"/]|/config\$" /etc/logrotate.d /defaults /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do sed -Ei "s=(/config)+(/| |$|\"|\')=$CONFIGLOCATION\2=g" "$file"; done \
&& for file in $(grep -Esril "/config[ '\"/]|/config\$" /etc /defaults); do sed -Ei "s=(/config)+(/| |$|\"|\')=$CONFIGLOCATION\2=g" $file; done \
\
# Avoid chmod /config
&& for files in /etc/services.d/*/* /etc/cont-init.d/* /etc/s6-overlay/s6-rc.d/*/*;do if [ -f $files ] && [[ ! -z $(awk '/chown.*abc:abc.*\\/,/.*\/config( |$)/{print FILENAME}' "$files") ]] ; then sed -i "s|/config$|/data|g" "$files"; fi ;done
&& for file in /etc/services.d/*/* /etc/cont-init.d/* /etc/s6-overlay/s6-rc.d/*/*;do if [ -f $files ] && [[ ! -z $(awk '/chown.*abc:abc.*\\/,/.*\/config( |$)/{print FILENAME}' $file) ]] ; then sed -i "s|/config$|/data|g" $file; fi ;done
# Specific images modifications
RUN \

View File

@@ -90,6 +90,6 @@
},
"slug": "calibre-web",
"url": "https://github.com/alexbelgium/hassio-addons/tree/master/calibre-web",
"version": "0.6.19-ls178",
"version": "0.6.19-ls182",
"video": true
}

View File

@@ -1,10 +1,10 @@
{
"github_fulltag": "true",
"last_update": "13-10-2022",
"last_update": "02-11-2022",
"paused": false,
"repository": "alexbelgium/hassio-addons",
"slug": "calibre-web",
"source": "github",
"upstream_repo": "linuxserver/docker-calibre-web",
"upstream_version": "0.6.19-ls178"
"upstream_version": "0.6.19-ls182"
}

View File

@@ -1,4 +1,7 @@
## 16.6.1 (22-10-2022)
- Update to latest version from coderaiser/cloudcmd
## 16.6.0 (11-10-2022)
- Update to latest version from coderaiser/cloudcmd

View File

@@ -74,5 +74,5 @@
},
"slug": "cloudcommander",
"url": "https://github.com/alexbelgium/hassio-addons/tree/master/cloudcommander",
"version": "16.6.0"
"version": "16.6.1"
}

View File

@@ -1,8 +1,8 @@
{
"last_update": "11-10-2022",
"last_update": "22-10-2022",
"repository": "alexbelgium/hassio-addons",
"slug": "cloudcommander",
"source": "github",
"upstream_repo": "coderaiser/cloudcmd",
"upstream_version": "16.6.0"
"upstream_version": "16.6.1"
}

View File

@@ -1,4 +1,10 @@
## 4.8.1 (29-10-2022)
- Update to latest version from linuxserver/docker-code-server
## 4.8.0 (27-10-2022)
- Update to latest version from linuxserver/docker-code-server
## 4.7.1 (01-10-2022)
- Update to latest version from linuxserver/docker-code-server

View File

@@ -30,22 +30,22 @@ ENV S6_CMD_WAIT_FOR_SERVICES=1 \
# Global LSIO modifications
ARG CONFIGLOCATION="/data"
# hadolint ignore=SC2015, SC2013
# hadolint ignore=SC2015, SC2013, SC2086
RUN \
# Avoid custom-init.d duplications
for file in $(grep -sril 'Potential tampering with custom' /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do rm -f "$file"; done \
for file in $(grep -sril 'Potential tampering with custom' /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do rm -f $file; done \
\
# Create new config folder if needed
&& for file in $(grep -srl "PUID" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" "$file"; done \
&& for file in $(grep -srl "PUID" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" $file; done \
\
# Allow UID and GID setting
&& for file in $(grep -srl "PUID" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' "$file" && sed -i '1a PUID="$(if bashio::config.has_value "PUID"; then bashio::config "PUID"; else echo "0"; fi)"' "$file" && sed -i '1a PGID="$(if bashio::config.has_value "PGID"; then bashio::config "PGID"; else echo "0"; fi)"' "$file"; done \
&& for file in $(grep -srl "PUID" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' $file && sed -i '1a PUID="$(if bashio::config.has_value "PUID"; then bashio::config "PUID"; else echo "0"; fi)"' $file && sed -i '1a PGID="$(if bashio::config.has_value "PGID"; then bashio::config "PGID"; else echo "0"; fi)"' $file; done \
\
# Correct config location
&& for file in $(grep -Esril "/config[ '\"/]|/config\$" /etc/logrotate.d /defaults /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do sed -Ei "s=(/config)+(/| |$|\"|\')=$CONFIGLOCATION\2=g" "$file"; done \
&& for file in $(grep -Esril "/config[ '\"/]|/config\$" /etc /defaults); do sed -Ei "s=(/config)+(/| |$|\"|\')=$CONFIGLOCATION\2=g" $file; done \
\
# Avoid chmod /config
&& for files in /etc/services.d/*/* /etc/cont-init.d/* /etc/s6-overlay/s6-rc.d/*/*;do if [ -f $files ] && [[ ! -z $(awk '/chown.*abc:abc.*\\/,/.*\/config( |$)/{print FILENAME}' "$files") ]] ; then sed -i "s|/config$|/data|g" "$files"; fi ;done
&& for file in /etc/services.d/*/* /etc/cont-init.d/* /etc/s6-overlay/s6-rc.d/*/*;do if [ -f $files ] && [[ ! -z $(awk '/chown.*abc:abc.*\\/,/.*\/config( |$)/{print FILENAME}' $file) ]] ; then sed -i "s|/config$|/data|g" $file; fi ;done
##################
# 3 Install apps #

View File

@@ -1,4 +1,6 @@
# Home assistant add-on: code-server (not recommended : use https://github.com/hassio-addons/addon-vscode)
# Home assistant add-on: code-server
# ⚠️ It is recommended to use the official addon (https://github.com/hassio-addons/addon-vscode) instead of this fork. The only benefit of this fork is automated releases, now implemented in the offical one. ⚠️
[![Donate][donation-badge]](https://www.buymeacoffee.com/alexbelgium)
@@ -14,7 +16,6 @@
_Thanks to everyone having starred my repo! To star it click on the image below, then it will be on top right. Thanks!_
[![Stargazers repo roster for @alexbelgium/hassio-addons](https://git-lister.onrender.com/api/stars/alexbelgium/hassio-addons?limit=30)](https://github.com/alexbelgium/hassio-addons/stargazers)
## About

View File

@@ -74,6 +74,6 @@
},
"slug": "code-server",
"url": "https://github.com/alexbelgium/hassio-addons/tree/master/coder-server",
"version": "4.7.1",
"version": "4.8.1",
"webui": "[PROTO:ssl]://[HOST]:[PORT:8443]"
}

View File

@@ -1,8 +1,8 @@
{
"last_update": "01-10-2022",
"last_update": "29-10-2022",
"repository": "alexbelgium/hassio-addons",
"slug": "code-server",
"source": "github",
"upstream_repo": "linuxserver/docker-code-server",
"upstream_version": "4.7.1"
"upstream_version": "4.8.1"
}

View File

@@ -1,4 +1,10 @@
## 4.8.0.15 (29-10-2022)
- Update to latest version from linuxserver/docker-emby
## 4.8.0.13 (22-10-2022)
- Update to latest version from linuxserver/docker-emby
## 4.8.0.12 (15-10-2022)
- Update to latest version from linuxserver/docker-emby

View File

@@ -30,22 +30,22 @@ ENV S6_CMD_WAIT_FOR_SERVICES=1 \
# Global LSIO modifications
ARG CONFIGLOCATION="/emby"
# hadolint ignore=SC2015, SC2013
# hadolint ignore=SC2015, SC2013, SC2086
RUN \
# Avoid custom-init.d duplications
for file in $(grep -sril 'Potential tampering with custom' /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do rm -f "$file"; done \
for file in $(grep -sril 'Potential tampering with custom' /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do rm -f $file; done \
\
# Create new config folder if needed
&& for file in $(grep -srl "PUID" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" "$file"; done \
&& for file in $(grep -srl "PUID" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" $file; done \
\
# Allow UID and GID setting
&& for file in $(grep -srl "PUID" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' "$file" && sed -i '1a PUID="$(if bashio::config.has_value "PUID"; then bashio::config "PUID"; else echo "0"; fi)"' "$file" && sed -i '1a PGID="$(if bashio::config.has_value "PGID"; then bashio::config "PGID"; else echo "0"; fi)"' "$file"; done \
&& for file in $(grep -srl "PUID" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' $file && sed -i '1a PUID="$(if bashio::config.has_value "PUID"; then bashio::config "PUID"; else echo "0"; fi)"' $file && sed -i '1a PGID="$(if bashio::config.has_value "PGID"; then bashio::config "PGID"; else echo "0"; fi)"' $file; done \
\
# Correct config location
&& for file in $(grep -Esril "/config[ '\"/]|/config\$" /etc/logrotate.d /defaults /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do sed -Ei "s=(/config)+(/| |$|\"|\')=$CONFIGLOCATION\2=g" "$file"; done \
# Search occurences of /config and change it to the expected new config
&& for file in $(grep -Esril "/config" /etc /defaults); do sed -Ei "s=(/config)+(/| |$|\"|\')=$CONFIGLOCATION\2=g" $file; done \
\
# Avoid chmod /config
&& for files in /etc/services.d/*/* /etc/cont-init.d/* /etc/s6-overlay/s6-rc.d/*/*;do if [ -f $files ] && [[ ! -z $(awk '/chown.*abc:abc.*\\/,/.*\/config( |$)/{print FILENAME}' "$files") ]] ; then sed -i "s|/config$|/data|g" "$files"; fi ;done
&& for file in /etc/services.d/*/* /etc/cont-init.d/* /etc/s6-overlay/s6-rc.d/*/*;do if [ -f $files ] && [[ ! -z $(awk '/chown.*abc:abc.*\\/,/.*\/config( |$)/{print FILENAME}' $file) ]] ; then sed -i "s|/config$|/data|g" $file; fi ;done
##################
# 3 Install apps #

View File

@@ -107,6 +107,6 @@
},
"slug": "emby_nas",
"url": "https://github.com/alexbelgium/hassio-addons/tree/master/emby",
"version": "4.8.0.12",
"version": "4.8.0.15",
"video": true
}

View File

@@ -6,7 +6,7 @@
###############
if bashio::config.true 'silent'; then
APPEND=' > /dev/null'
sed -i '$s|$|'"$APPEND"'|' /etc/services.d/*/run
APPEND=' >/dev/null'
sed -i '$s|$|'"$APPEND"'|' /etc/s6-overlay/s6-rc.d/*/run
bashio::log.info 'Silent mode activated, all logs from emby server are hidden. Disable this option if you need to troubleshoot the addon.'
fi

View File

@@ -34,22 +34,22 @@ http {
# https://emby.media/community/index.php?/topic/93074-how-to-emby-with-nginx-with-windows-specific-tips-and-csp-options/
server_names_hash_bucket_size 64;
gzip_disable "msie6";
gzip_comp_level 6;
gzip_min_length 1100;
gzip_buffers 16 8k;
gzip_proxied any;
gzip_types
text/plain
text/css
text/js
text/xml
text/javascript
application/javascript
application/x-javascript
application/json
application/xml
application/rss+xml
image/svg+xml;
gzip_comp_level 6;
gzip_min_length 1100;
gzip_buffers 16 8k;
gzip_proxied any;
gzip_types
text/plain
text/css
text/js
text/xml
text/javascript
application/javascript
application/x-javascript
application/json
application/xml
application/rss+xml
image/svg+xml;
proxy_connect_timeout 1h;
log_format hassio '[$time_local] $status '

View File

@@ -1,9 +1,9 @@
{
"github_beta": "true",
"last_update": "15-10-2022",
"last_update": "29-10-2022",
"repository": "alexbelgium/hassio-addons",
"slug": "emby",
"source": "github",
"upstream_repo": "linuxserver/docker-emby",
"upstream_version": "4.8.0.12"
"upstream_version": "4.8.0.15"
}

View File

@@ -1,8 +1,17 @@
## 30-10-2022
- New config.js update
## ee3dff4b29757e28282cada9bcb3e8f84f1c3041-2022-10-23 (2022-10-23)
- Update to latest version from charlocharlie/epicgames-freegames
## 80fdb2447c8846bee011c0d6d5c44c56210cb24a-2022-09-23 (2022-09-23)
- Update to latest version from charlocharlie/epicgames-freegames
## 9531608362dc8c1232c1e12005541796610d2af7-2021-12-17 (2021-12-17)
- Update to latest version from charlocharlie/epicgames-freegames
## 4.1.0 (21-07-2022)

View File

@@ -4,7 +4,7 @@
"amd64"
],
"codenotary": "alexandrep.github@gmail.com",
"description": "Automatically login and redeem promotional free games from the Epic Games Store",
"description": "Automatically login and redeem promotional free games from Epic Games Store",
"image": "ghcr.io/alexbelgium/epicgamesfree-{arch}",
"init": false,
"map": [
@@ -19,6 +19,6 @@
},
"slug": "epicgamesfree",
"url": "https://github.com/alexbelgium/hassio-addons",
"version": "80fdb2447c8846bee011c0d6d5c44c56210cb24a-2022-09-23",
"version": "ee3dff4b29757e28282cada9bcb3e8f84f1c3041-2022-10-30-2",
"webui": "[PROTO:ssl]://[HOST]:[PORT:3000]"
}
}

View File

@@ -1,60 +1,62 @@
{
"runOnStartup":true,
"cronSchedule":"5 16 * * *",
"logLevel":"info",
"webPortalConfig":{
"baseUrl":"https://epic.exmaple.com"
},
"accounts":[
{
"email":"example@gmail.com",
"password":"abc1234",
"totp":"EMNCAZE234AZEEMNCAZE234AZEEMNCAZE234AZEEMNCAZE234AZEEMNCAZE234AZEEMNCAZE234AZEEMNCAZE234AZEEMNCAZE234AZE"
"runOnStartup": true,
"cronSchedule": "5 16 * * *",
"logLevel": "info",
"webPortalConfig": {
"baseUrl": "https://localhost:3000"
},
"accounts": [
{
"email": "example@gmail.com",
"password": "abc1234",
"totp": "EMNCF83ULU3K3PXPJBSWY3DPEHPK3PXPJWY3DPEHPK3YI69R39NE"
}
],
"notifiers": [
{
"type": "email",
"smtpHost": "smtp.gmail.com",
"smtpPort": 587,
"emailSenderAddress": "hello@gmail.com",
"emailSenderName": "Epic Games Captchas",
"emailRecipientAddress": "hello@gmail.com",
"secure": false,
"auth": {
"user": "hello@gmail.com",
"pass": "abc123"
}
],
"notifiers":[
{
"type":"email",
"smtpHost":"smtp.gmail.com",
"smtpPort":587,
"emailSenderAddress":"hello@gmail.com",
"emailSenderName":"Epic Games Captchas",
"emailRecipientAddress":"hello@gmail.com",
"secure":false,
"auth":{
"user":"hello@gmail.com",
"pass":"abc123"
}
},
{
"type":"discord",
"webhookUrl":"https://discord.com/api/webhooks/123456789123456789/A-abcdefghijklmn-abcdefghijklmnopqrst12345678-abcdefghijklmnop123456",
"mentionedUsers":[
"914360712086843432"
],
"mentionedRoles":[
"734548250895319070"
]
},
{
"type":"telegram",
"token":"to_fill",
"chatId":"-987654321"
},
{
"type":"apprise",
"apiUrl":"http://192.168.1.2:8000",
"urls":"mailto://user:pass@gmail.com"
},
{
"type":"pushover",
"token":"to_fill",
"userKey":"to_fill"
},
{
"type":"gotify",
"apiUrl":"https://gotify.net",
"token":"SnL-wAvmfo_QT"
}
]
},
{
"type": "discord",
"webhookUrl": "https://discord.com/api/webhooks/123456789123456789/A-abcdefghijklmn-abcdefghijklmnopqrst12345678-abcdefghijklmnop123456",
"mentionedUsers": ["914360712086843432"],
"mentionedRoles": ["734548250895319070"]
},
{
"type": "telegram",
"token": "644739147:AAGMPo-Jz3mKRnHRTnrPEDi7jUF1vqNOD5k",
"chatId": "-987654321"
},
{
"type": "apprise",
"apiUrl": "http://192.168.1.2:8000",
"urls": "mailto://user:pass@gmail.com"
},
{
"type": "pushover",
"token": "a172fyyl9gw99p2xi16tq8hnib48p2",
"userKey": "uvgidym7l5ggpwu2r8i1oy6diaapll"
},
{
"type": "gotify",
"apiUrl": "https://gotify.net",
"token": "SnL-wAvmfo_QT"
},
{
"type": "homeassistant",
"instance": "https://homeassistant.example.com",
"token": "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiIxMjM0NTY3ODkwIiwibmFtZSI6IkpvaG4gRG9lIiwiaWF0IjoxNTE2MjM5MDIyfQ.SflKxwRJSMeKKF2QT4fwpMeJf36POk6yJV_adQssw5c",
"notifyservice": "mobile_app_smartphone_name"
}
]
}

View File

@@ -1,10 +1,10 @@
{
"dockerhub_by_date": true,
"dockerhub_list_size": 2,
"last_update": "2022-09-23",
"last_update": "2022-10-23",
"repository": "alexbelgium/hassio-addons",
"slug": "epicgamesfree",
"source": "dockerhub",
"upstream_repo": "charlocharlie/epicgames-freegames",
"upstream_version": "80fdb2447c8846bee011c0d6d5c44c56210cb24a-2022-09-23"
"upstream_version": "ee3dff4b29757e28282cada9bcb3e8f84f1c3041-2022-10-23"
}

View File

@@ -1,4 +1,12 @@
## 5.7.15 (02-11-2022)
- Update to latest version from firefly-iii/firefly-iii
## 5.7.14-2 (29-10-2022)
- Fix bug #530
## 5.7.14 (20-10-2022)
- Update to latest version from firefly-iii/firefly-iii
## 5.7.13 (18-10-2022)
- Update to latest version from firefly-iii/firefly-iii

View File

@@ -33,13 +33,16 @@ ENV S6_CMD_WAIT_FOR_SERVICES=1 \
# # Change data location
# grep -rl "/var/www/html" /etc/ | xargs sed -i 's|/var/www/html|/data/firefly|g'
ARG BUILD_UPSTREAM="5.7.13"
ARG BUILD_UPSTREAM="5.7.15"
RUN \
#################
# Fix for 5.7.5 #
#################
if [ "$BUILD_UPSTREAM" = "5.7.13" ] ; then \
if [ "$BUILD_UPSTREAM" = "5.7.15" ] ; then \
sed -i "s|, \$transaction\[\x27amount\x27\] ?? \x270\x27);|, (string)(\$transaction\[\x27amount\x27\] ?? \x270\x27));|g" /var/www/html/app/Helpers/Collector/GroupCollector.php; else echo "not 5.7.5"; fi
RUN \
# Change upload folder to "ha_upload" since the default one is binded to a volume (see base image)
sed -i "s/'root' => storage_path('upload'),/'root' => storage_path('ha_upload'),/g" /var/www/html/config/filesystems.php
##################
# 3 Install apps #

View File

@@ -46,6 +46,6 @@
"slug": "fireflyiii",
"startup": "services",
"url": "https://github.com/alexbelgium/hassio-addons",
"version": "5.7.13",
"version": "5.7.15",
"webui": "[PROTO:ssl]://[HOST]:[PORT:8080]"
}

View File

@@ -48,6 +48,7 @@ case $(bashio::config 'DB_CONNECTION') in
# Set variable
export DB_CONNECTION=sqlite
export DB_DATABASE=/config/addons_config/fireflyiii/database/database.sqlite
# Creating folders
mkdir -p /config/addons_config/fireflyiii/database
@@ -66,7 +67,7 @@ case $(bashio::config 'DB_CONNECTION') in
# Creating symlink
rm -r /var/www/html/storage/database
ln -s /config/addons_config/fireflyiii/database /var/www/html/storage/database
ln -s /config/addons_config/fireflyiii/database /var/www/html/storage
# Updating permissions
chmod 775 /config/addons_config/fireflyiii/database/database.sqlite
@@ -121,6 +122,29 @@ case $(bashio::config 'DB_CONNECTION') in
esac
########################
# Define upload folder #
########################
bashio::log.info "Defining upload folder"
# Creating folder
if [ ! -d /config/addons_config/fireflyiii/upload ]; then
mkdir -p /config/addons_config/fireflyiii/upload
chown -R www-data:www-data /config/addons_config/fireflyiii/upload
fi
# Creating symlink
if [ -d /var/www/html/storage/ha_upload ]; then
rm -r /var/www/html/storage/ha_upload
fi
ln -s /config/addons_config/fireflyiii/upload /var/www/html/storage/ha_upload
# Updating permissions
chown -R www-data:www-data /config/addons_config/fireflyiii
chown -R www-data:www-data /var/www/html/storage
chmod -R 775 /config/addons_config/fireflyiii
################
# CRON OPTIONS #
################

View File

@@ -1,8 +1,8 @@
{
"last_update": "18-10-2022",
"last_update": "02-11-2022",
"repository": "alexbelgium/hassio-addons",
"slug": "fireflyiii",
"source": "github",
"upstream_repo": "firefly-iii/firefly-iii",
"upstream_version": "5.7.13"
"upstream_version": "5.7.15"
}

View File

@@ -1,4 +1,7 @@
## version-0.9.17 (25-10-2022)
- Update to latest version from fireflyiii/data-importer
## version-0.9.16 (13-09-2022)
- Update to latest version from fireflyiii/data-importer

View File

@@ -16,7 +16,7 @@
ARG BUILD_FROM
ARG BUILD_VERSION
ARG BUILD_UPSTREAM="version-0.9.16"
ARG BUILD_UPSTREAM="version-0.9.17"
FROM ${BUILD_FROM}
##################

View File

@@ -39,6 +39,6 @@
},
"slug": "fireflyiii_data_importer",
"url": "https://github.com/alexbelgium/hassio-addons",
"version": "version-0.9.16",
"version": "version-0.9.17",
"webui": "[PROTO:ssl]://[HOST]:[PORT:8080]"
}

View File

@@ -1,8 +1,8 @@
{
"last_update": "13-09-2022",
"last_update": "25-10-2022",
"repository": "alexbelgium/hassio-addons",
"slug": "fireflyiii_data_importer",
"source": "dockerhub",
"upstream_repo": "fireflyiii/data-importer",
"upstream_version": "version-0.9.16"
"upstream_version": "version-0.9.17"
}

View File

@@ -1,4 +1,7 @@
## 2.2.10 (25-10-2022)
- Update to latest version from FlareSolverr/FlareSolverr
## 2.2.9 (27-09-2022)
- Update to latest version from FlareSolverr/FlareSolverr

View File

@@ -15,6 +15,6 @@
},
"slug": "flaresolverr",
"url": "https://github.com/alexbelgium/hassio-addons",
"version": "2.2.9",
"version": "2.2.10",
"webui": "[PROTO:ssl]://[HOST]:[PORT:8191]"
}

View File

@@ -1,8 +1,8 @@
{
"last_update": "27-09-2022",
"last_update": "25-10-2022",
"repository": "alexbelgium/hassio-addons",
"slug": "flaresolverr",
"source": "github",
"upstream_repo": "FlareSolverr/FlareSolverr",
"upstream_version": "2.2.9"
"upstream_version": "2.2.10"
}

View File

@@ -1,4 +1,13 @@
## 3.4.2 (29-10-2022)
- Update to latest version from wiserain/flexget
## 3.4.0 (27-10-2022)
- Update to latest version from wiserain/flexget
## 3.3.39 (22-10-2022)
- Update to latest version from wiserain/flexget
## 3.3.35 (15-10-2022)
- Update to latest version from wiserain/flexget

View File

@@ -29,32 +29,32 @@ ENV S6_CMD_WAIT_FOR_SERVICES=1 \
SHELL ["/bin/bash", "-o", "pipefail", "-c"]
# hadolint ignore=SC2016
# hadolint ignore=SC2016,SC2086
RUN \
# Set password
files="$(grep -sril "set FG_WEBUI_PASSWD" /etc/cont-init.d /etc/s6-overlay/s6-rc.d)" \
&& sed -i 's/bash/bashio/g' "$files" \
&& sed -i 's/# set FG_WEBUI_PASSWD/if bashio::config.has_value "WebuiPass"; then FG_WEBUI_PASSWD=$(bashio::config "WebuiPass"); else FG_WEBUI_PASSWD=""; fi/g' "$files" \
&& sed -i 's/# install custom plugins/if bashio::config.has_value "FG_PLUGINS"; then FG_PLUGINS=$(bashio::config "FG_PLUGINS"); else FG_PLUGINS=""; fi/g' "$files"
files=$(grep -sril "set FG_WEBUI_PASSWD" /etc/s6-overlay/s6-rc.d) \
&& sed -i 's/bash/bashio/g' $files \
&& sed -i 's/# set FG_WEBUI_PASSWD/if bashio::config.has_value "WebuiPass"; then FG_WEBUI_PASSWD=$(bashio::config "WebuiPass"); else FG_WEBUI_PASSWD=""; fi/g' $files \
&& sed -i 's/# install custom plugins/if bashio::config.has_value "FG_PLUGINS"; then FG_PLUGINS=$(bashio::config "FG_PLUGINS"); else FG_PLUGINS=""; fi/g' $files
# Global LSIO modifications
ARG CONFIGLOCATION="/config/addons_config/flexget"
# hadolint ignore=SC2015, SC2013
# hadolint ignore=SC2015, SC2013, SC2086
RUN \
# Avoid custom-init.d duplications
for file in $(grep -sril 'Potential tampering with custom' /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do rm -f "$file"; done \
for file in $(grep -sril 'Potential tampering with custom' /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do rm -f $file; done \
\
# Create new config folder if needed
&& for file in $(grep -srl "PUID" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" "$file"; done \
&& for file in $(grep -srl "PUID" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" $file; done \
\
# Allow UID and GID setting
&& for file in $(grep -srl "PUID" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' "$file" && sed -i '1a PUID="$(if bashio::config.has_value "PUID"; then bashio::config "PUID"; else echo "0"; fi)"' "$file" && sed -i '1a PGID="$(if bashio::config.has_value "PGID"; then bashio::config "PGID"; else echo "0"; fi)"' "$file"; done \
&& for file in $(grep -srl "PUID" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' $file && sed -i '1a PUID="$(if bashio::config.has_value "PUID"; then bashio::config "PUID"; else echo "0"; fi)"' $file && sed -i '1a PGID="$(if bashio::config.has_value "PGID"; then bashio::config "PGID"; else echo "0"; fi)"' $file; done \
\
# Correct config location
&& for file in $(grep -Esril "/config[ '\"/]|/config\$" /etc/logrotate.d /defaults /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do sed -Ei "s=(/config)+(/| |$|\"|\')=$CONFIGLOCATION\2=g" "$file"; done \
&& for file in $(grep -Esril "/config[ '\"/]|/config\$" /etc /defaults); do sed -Ei "s=(/config)+(/| |$|\"|\')=$CONFIGLOCATION\2=g" $file; done \
\
# Avoid chmod /config
&& for files in /etc/services.d/*/* /etc/cont-init.d/* /etc/s6-overlay/s6-rc.d/*/*;do if [ -f $files ] && [[ ! -z $(awk '/chown.*abc:abc.*\\/,/.*\/config( |$)/{print FILENAME}' "$files") ]] ; then sed -i "s|/config$|/data|g" "$files"; fi ;done
&& for file in /etc/services.d/*/* /etc/cont-init.d/* /etc/s6-overlay/s6-rc.d/*/*;do if [ -f $files ] && [[ ! -z $(awk '/chown.*abc:abc.*\\/,/.*\/config( |$)/{print FILENAME}' $file) ]] ; then sed -i "s|/config$|/data|g" $file; fi ;done
##################
# 3 Install apps #

View File

@@ -37,6 +37,6 @@
},
"slug": "flexget",
"url": "https://github.com/alexbelgium/hassio-addons",
"version": "3.3.35-2",
"version": "3.4.2",
"webui": "[PROTO:ssl]://[HOST]:[PORT:5050]"
}
}

View File

@@ -1,8 +1,8 @@
{
"last_update": "15-10-2022",
"last_update": "29-10-2022",
"repository": "alexbelgium/hassio-addons",
"slug": "flexget",
"source": "dockerhub",
"upstream_repo": "wiserain/flexget",
"upstream_version": "3.3.35"
"upstream_version": "3.4.2"
}

View File

@@ -29,22 +29,22 @@ ENV S6_CMD_WAIT_FOR_SERVICES=1 \
# Global LSIO modifications
ARG CONFIGLOCATION="/share/grav"
# hadolint ignore=SC2015, SC2013
# hadolint ignore=SC2015, SC2013, SC2086
RUN \
# Avoid custom-init.d duplications
for file in $(grep -sril 'Potential tampering with custom' /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do rm -f "$file"; done \
for file in $(grep -sril 'Potential tampering with custom' /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do rm -f $file; done \
\
# Create new config folder if needed
&& for file in $(grep -srl "PUID" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" "$file"; done \
&& for file in $(grep -srl "PUID" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" $file; done \
\
# Allow UID and GID setting
&& for file in $(grep -srl "PUID" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' "$file" && sed -i '1a PUID="$(if bashio::config.has_value "PUID"; then bashio::config "PUID"; else echo "0"; fi)"' "$file" && sed -i '1a PGID="$(if bashio::config.has_value "PGID"; then bashio::config "PGID"; else echo "0"; fi)"' "$file"; done \
&& for file in $(grep -srl "PUID" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' $file && sed -i '1a PUID="$(if bashio::config.has_value "PUID"; then bashio::config "PUID"; else echo "0"; fi)"' $file && sed -i '1a PGID="$(if bashio::config.has_value "PGID"; then bashio::config "PGID"; else echo "0"; fi)"' $file; done \
\
# Correct config location
&& for file in $(grep -Esril "/config[ '\"/]|/config\$" /etc/logrotate.d /defaults /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do sed -Ei "s=(/config)+(/| |$|\"|\')=$CONFIGLOCATION\2=g" "$file"; done \
&& for file in $(grep -Esril "/config[ '\"/]|/config\$" /etc /defaults); do sed -Ei "s=(/config)+(/| |$|\"|\')=$CONFIGLOCATION\2=g" $file; done \
\
# Avoid chmod /config
&& for files in /etc/services.d/*/* /etc/cont-init.d/* /etc/s6-overlay/s6-rc.d/*/*;do if [ -f $files ] && [[ ! -z $(awk '/chown.*abc:abc.*\\/,/.*\/config( |$)/{print FILENAME}' "$files") ]] ; then sed -i "s|/config$|/data|g" "$files"; fi ;done
&& for file in /etc/services.d/*/* /etc/cont-init.d/* /etc/s6-overlay/s6-rc.d/*/*;do if [ -f $files ] && [[ ! -z $(awk '/chown.*abc:abc.*\\/,/.*\/config( |$)/{print FILENAME}' $file) ]] ; then sed -i "s|/config$|/data|g" $file; fi ;done
##################
# 3 Install apps #

View File

@@ -1,4 +1,25 @@
## 0.20.2186 (02-11-2022)
- Update to latest version from linuxserver/docker-jackett
## 0.20.2180 (01-11-2022)
- Update to latest version from linuxserver/docker-jackett
## 0.20.2171 (29-10-2022)
- Update to latest version from linuxserver/docker-jackett
## 0.20.2167 (27-10-2022)
- Update to latest version from linuxserver/docker-jackett
## 0.20.2158 (25-10-2022)
- Update to latest version from linuxserver/docker-jackett
## 0.20.2134 (22-10-2022)
- Update to latest version from linuxserver/docker-jackett
## 0.20.2124 (20-10-2022)
- Update to latest version from linuxserver/docker-jackett
## 0.20.2122 (18-10-2022)
- Update to latest version from linuxserver/docker-jackett

View File

@@ -29,22 +29,22 @@ ENV S6_CMD_WAIT_FOR_SERVICES=1 \
# Global LSIO modifications
ARG CONFIGLOCATION="/config/addons_config/Jackett"
# hadolint ignore=SC2015, SC2013
# hadolint ignore=SC2015, SC2013, SC2086
RUN \
# Avoid custom-init.d duplications
for file in $(grep -sril 'Potential tampering with custom' /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do rm -f "$file"; done \
for file in $(grep -sril 'Potential tampering with custom' /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do rm -f $file; done \
\
# Create new config folder if needed
&& for file in $(grep -srl "PUID" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" "$file"; done \
&& for file in $(grep -srl "PUID" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" $file; done \
\
# Allow UID and GID setting
&& for file in $(grep -srl "PUID" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' "$file" && sed -i '1a PUID="$(if bashio::config.has_value "PUID"; then bashio::config "PUID"; else echo "0"; fi)"' "$file" && sed -i '1a PGID="$(if bashio::config.has_value "PGID"; then bashio::config "PGID"; else echo "0"; fi)"' "$file"; done \
&& for file in $(grep -srl "PUID" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' $file && sed -i '1a PUID="$(if bashio::config.has_value "PUID"; then bashio::config "PUID"; else echo "0"; fi)"' $file && sed -i '1a PGID="$(if bashio::config.has_value "PGID"; then bashio::config "PGID"; else echo "0"; fi)"' $file; done \
\
# Correct config location
&& for file in $(grep -Esril "/config[ '\"/]|/config\$" /etc/logrotate.d /defaults /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do sed -Ei "s=(/config)+(/| |$|\"|\')=$CONFIGLOCATION\2=g" "$file"; done \
&& for file in $(grep -Esril "/config[ '\"/]|/config\$" /etc /defaults); do sed -Ei "s=(/config)+(/| |$|\"|\')=$CONFIGLOCATION\2=g" $file; done \
\
# Avoid chmod /config
&& for files in /etc/services.d/*/* /etc/cont-init.d/* /etc/s6-overlay/s6-rc.d/*/*;do if [ -f $files ] && [[ ! -z $(awk '/chown.*abc:abc.*\\/,/.*\/config( |$)/{print FILENAME}' "$files") ]] ; then sed -i "s|/config$|/data|g" "$files"; fi ;done
&& for file in /etc/services.d/*/* /etc/cont-init.d/* /etc/s6-overlay/s6-rc.d/*/*;do if [ -f $files ] && [[ ! -z $(awk '/chown.*abc:abc.*\\/,/.*\/config( |$)/{print FILENAME}' $file) ]] ; then sed -i "s|/config$|/data|g" $file; fi ;done
# Changes config directory
ENV XDG_CONFIG_HOME="/config/addons_config"

View File

@@ -43,6 +43,6 @@
},
"slug": "jackett_nas",
"url": "https://github.com/alexbelgium/hassio-addons/tree/master/jackett",
"version": "0.20.2122",
"version": "0.20.2186",
"webui": "[PROTO:ssl]://[HOST]:[PORT:9117]"
}

View File

@@ -1,8 +1,8 @@
{
"last_update": "18-10-2022",
"last_update": "02-11-2022",
"repository": "alexbelgium/hassio-addons",
"slug": "jackett",
"source": "github",
"upstream_repo": "linuxserver/docker-jackett",
"upstream_version": "0.20.2122"
"upstream_version": "0.20.2186"
}

View File

@@ -1,4 +1,16 @@
## 10.8.7-1-ls186 (02-11-2022)
- Update to latest version from linuxserver/docker-jellyfin
## 10.8.6-1-ls185 (01-11-2022)
- Update to latest version from linuxserver/docker-jellyfin
## 10.8.5-1-ls184 (29-10-2022)
- Update to latest version from linuxserver/docker-jellyfin
## 10.8.5-1-ls183 (22-10-2022)
- Update to latest version from linuxserver/docker-jellyfin
## 10.8.5-1-ls182 (15-10-2022)
- Update to latest version from linuxserver/docker-jellyfin

View File

@@ -30,22 +30,22 @@ ENV S6_CMD_WAIT_FOR_SERVICES=0 \
# Global LSIO modifications
ARG CONFIGLOCATION="/config"
# hadolint ignore=SC2015, SC2013
# hadolint ignore=SC2015, SC2013, SC2086
RUN \
# Avoid custom-init.d duplications
for file in $(grep -sril 'Potential tampering with custom' /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do rm -f "$file"; done \
for file in $(grep -sril 'Potential tampering with custom' /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do rm -f $file; done \
\
# Create new config folder if needed
&& for file in $(grep -srl "PUID" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" "$file"; done \
&& for file in $(grep -srl "PUID" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" $file; done \
\
# Allow UID and GID setting
&& for file in $(grep -srl "PUID" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' "$file" && sed -i '1a PUID="$(if bashio::config.has_value "PUID"; then bashio::config "PUID"; else echo "0"; fi)"' "$file" && sed -i '1a PGID="$(if bashio::config.has_value "PGID"; then bashio::config "PGID"; else echo "0"; fi)"' "$file"; done \
&& for file in $(grep -srl "PUID" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' $file && sed -i '1a PUID="$(if bashio::config.has_value "PUID"; then bashio::config "PUID"; else echo "0"; fi)"' $file && sed -i '1a PGID="$(if bashio::config.has_value "PGID"; then bashio::config "PGID"; else echo "0"; fi)"' $file; done \
\
# Correct config location
&& for file in $(grep -Esril "/config[ '\"/]|/config\$" /etc/logrotate.d /defaults /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do sed -Ei "s=(/config)+(/| |$|\"|\')=$CONFIGLOCATION\2=g" "$file"; done \
&& for file in $(grep -Esril "/config[ '\"/]|/config\$" /etc /defaults); do sed -Ei "s=(/config)+(/| |$|\"|\')=$CONFIGLOCATION\2=g" $file; done \
\
# Avoid chmod /config
&& for files in /etc/services.d/*/* /etc/cont-init.d/* /etc/s6-overlay/s6-rc.d/*/*;do if [ -f $files ] && [[ ! -z $(awk '/chown.*abc:abc.*\\/,/.*\/config( |$)/{print FILENAME}' "$files") ]] ; then sed -i "s|/config$|/data|g" "$files"; fi ;done
&& for file in /etc/services.d/*/* /etc/cont-init.d/* /etc/s6-overlay/s6-rc.d/*/*;do if [ -f $files ] && [[ ! -z $(awk '/chown.*abc:abc.*\\/,/.*\/config( |$)/{print FILENAME}' $file) ]] ; then sed -i "s|/config$|/data|g" $file; fi ;done
##################
# 3 Install apps #

View File

@@ -103,6 +103,6 @@
},
"slug": "jellyfin",
"url": "https://github.com/alexbelgium/hassio-addons",
"version": "10.8.5-1-ls182",
"version": "10.8.7-1-ls186",
"video": true
}

View File

@@ -1,9 +1,9 @@
{
"github_fulltag": "true",
"last_update": "15-10-2022",
"last_update": "02-11-2022",
"repository": "alexbelgium/hassio-addons",
"slug": "jellyfin",
"source": "github",
"upstream_repo": "linuxserver/docker-jellyfin",
"upstream_version": "10.8.5-1-ls182"
"upstream_version": "10.8.7-1-ls186"
}

View File

@@ -1,4 +1,10 @@
## 1.0.2.2592-ls101 (02-11-2022)
- Update to latest version from linuxserver/docker-lidarr
## 1.0.2.2592-ls100 (01-11-2022)
- Update to latest version from linuxserver/docker-lidarr
## 1.0.2.2592-ls99 (18-10-2022)
- Update to latest version from linuxserver/docker-lidarr

View File

@@ -29,22 +29,22 @@ ENV S6_CMD_WAIT_FOR_SERVICES=1 \
# Global LSIO modifications
ARG CONFIGLOCATION="/config/addons_config/lidarr"
# hadolint ignore=SC2015, SC2013
# hadolint ignore=SC2015, SC2013, SC2086
RUN \
# Avoid custom-init.d duplications
for file in $(grep -sril 'Potential tampering with custom' /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do rm -f "$file"; done \
for file in $(grep -sril 'Potential tampering with custom' /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do rm -f $file; done \
\
# Create new config folder if needed
&& for file in $(grep -srl "PUID" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" "$file"; done \
&& for file in $(grep -srl "PUID" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" $file; done \
\
# Allow UID and GID setting
&& for file in $(grep -srl "PUID" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' "$file" && sed -i '1a PUID="$(if bashio::config.has_value "PUID"; then bashio::config "PUID"; else echo "0"; fi)"' "$file" && sed -i '1a PGID="$(if bashio::config.has_value "PGID"; then bashio::config "PGID"; else echo "0"; fi)"' "$file"; done \
&& for file in $(grep -srl "PUID" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' $file && sed -i '1a PUID="$(if bashio::config.has_value "PUID"; then bashio::config "PUID"; else echo "0"; fi)"' $file && sed -i '1a PGID="$(if bashio::config.has_value "PGID"; then bashio::config "PGID"; else echo "0"; fi)"' $file; done \
\
# Correct config location
&& for file in $(grep -Esril "/config[ '\"/]|/config\$" /etc/logrotate.d /defaults /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do sed -Ei "s=(/config)+(/| |$|\"|\')=$CONFIGLOCATION\2=g" "$file"; done \
&& for file in $(grep -Esril "/config[ '\"/]|/config\$" /etc /defaults); do sed -Ei "s=(/config)+(/| |$|\"|\')=$CONFIGLOCATION\2=g" $file; done \
\
# Avoid chmod /config
&& for files in /etc/services.d/*/* /etc/cont-init.d/* /etc/s6-overlay/s6-rc.d/*/*;do if [ -f $files ] && [[ ! -z $(awk '/chown.*abc:abc.*\\/,/.*\/config( |$)/{print FILENAME}' "$files") ]] ; then sed -i "s|/config$|/data|g" "$files"; fi ;done
&& for file in /etc/services.d/*/* /etc/cont-init.d/* /etc/s6-overlay/s6-rc.d/*/*;do if [ -f $files ] && [[ ! -z $(awk '/chown.*abc:abc.*\\/,/.*\/config( |$)/{print FILENAME}' $file) ]] ; then sed -i "s|/config$|/data|g" $file; fi ;done
##################
# 3 Install apps #

View File

@@ -80,6 +80,6 @@
},
"slug": "lidarr_nas",
"url": "https://github.com/alexbelgium/hassio-addons/blob/master/lidarr/Readme.md",
"version": "1.0.2.2592-ls99",
"version": "1.0.2.2592-ls101",
"webui": "[PROTO:ssl]://[HOST]:[PORT:8686]"
}

View File

@@ -1,9 +1,9 @@
{
"github_fulltag": "true",
"last_update": "18-10-2022",
"last_update": "02-11-2022",
"repository": "alexbelgium/hassio-addons",
"slug": "lidarr",
"source": "github",
"upstream_repo": "linuxserver/docker-lidarr",
"upstream_version": "1.0.2.2592-ls99"
"upstream_version": "1.0.2.2592-ls101"
}

View File

@@ -1,17 +1,17 @@
:%%port%% {
@proxied path /api/* /docs /openapi.json
@proxied path /api/* /docs /openapi.json
@static {
file
path *.ico *.css *.js *.gif *.jpg *.jpeg *.png *.svg *.woff *.woff2 *.webp
}
@static {
file
path *.ico *.css *.js *.gif *.jpg *.jpeg *.png *.svg *.woff *.woff2 *.webp
}
encode gzip zstd
encode gzip zstd
# Handles Recipe Images / Assets
handle_path /api/media/recipes/* {
header Access-Control-Allow-Origin *
# Handles Recipe Images / Assets
handle_path /api/media/recipes/* {
header Access-Control-Allow-Origin *
header X-Content-Type-Options nosniff
header X-Robots-Tag none
header -X-Frame-Options
@@ -22,15 +22,15 @@
header X-Forwarded-For $proxy_add_x_forwarded_for
header X-Forwarded-Proto $scheme
header X-NginX-Proxy true
header X-External-Path $http_x_ingress_path
header X-External-Path $http_x_ingress_path
header X-Real-IP $remote_addr
header @static Cache-Control max-age=31536000
root * /app/data/recipes/
file_server
}
header @static Cache-Control max-age=31536000
root * /app/data/recipes/
file_server
}
handle @proxied {
header Access-Control-Allow-Origin *
handle @proxied {
header Access-Control-Allow-Origin *
header X-Content-Type-Options nosniff
header X-Robots-Tag none
header -X-Frame-Options
@@ -42,13 +42,13 @@
header X-Forwarded-Proto $scheme
header X-NginX-Proxy true
header X-Real-IP $remote_addr
header X-External-Path $http_x_ingress_path;
rewrite * {Referer}{uri}
reverse_proxy http://127.0.0.1:9000
}
header X-External-Path $http_x_ingress_path;
rewrite * {Referer}{uri}
reverse_proxy http://127.0.0.1:9000
}
handle {
header Access-Control-Allow-Origin *
handle {
header Access-Control-Allow-Origin *
header X-Content-Type-Options nosniff
header X-Robots-Tag none
header -X-Frame-Options
@@ -60,11 +60,11 @@
header X-Forwarded-Proto $scheme
header X-NginX-Proxy true
header X-Real-IP $remote_addr
header X-External-Path $http_x_ingress_path;
header @static Cache-Control max-age=31536000
root * /app/dist
try_files {path}.html {path} /
file_server
}
header X-External-Path $http_x_ingress_path;
header @static Cache-Control max-age=31536000
root * /app/dist
try_files {path}.html {path} /
file_server
}
}

View File

@@ -29,22 +29,22 @@ ENV S6_CMD_WAIT_FOR_SERVICES=1 \
# Global LSIO modifications
ARG CONFIGLOCATION="/data"
# hadolint ignore=SC2015, SC2013
# hadolint ignore=SC2015, SC2013, SC2086
RUN \
# Avoid custom-init.d duplications
for file in $(grep -sril 'Potential tampering with custom' /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do rm -f "$file"; done \
for file in $(grep -sril 'Potential tampering with custom' /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do rm -f $file; done \
\
# Create new config folder if needed
&& for file in $(grep -srl "PUID" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" "$file"; done \
&& for file in $(grep -srl "PUID" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" $file; done \
\
# Allow UID and GID setting
&& for file in $(grep -srl "PUID" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' "$file" && sed -i '1a PUID="$(if bashio::config.has_value "PUID"; then bashio::config "PUID"; else echo "0"; fi)"' "$file" && sed -i '1a PGID="$(if bashio::config.has_value "PGID"; then bashio::config "PGID"; else echo "0"; fi)"' "$file"; done \
&& for file in $(grep -srl "PUID" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' $file && sed -i '1a PUID="$(if bashio::config.has_value "PUID"; then bashio::config "PUID"; else echo "0"; fi)"' $file && sed -i '1a PGID="$(if bashio::config.has_value "PGID"; then bashio::config "PGID"; else echo "0"; fi)"' $file; done \
\
# Correct config location
&& for file in $(grep -Esril "/config[ '\"/]|/config\$" /etc/logrotate.d /defaults /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do sed -Ei "s=(/config)+(/| |$|\"|\')=$CONFIGLOCATION\2=g" "$file"; done \
&& for file in $(grep -Esril "/config[ '\"/]|/config\$" /etc /defaults); do sed -Ei "s=(/config)+(/| |$|\"|\')=$CONFIGLOCATION\2=g" $file; done \
\
# Avoid chmod /config
&& for files in /etc/services.d/*/* /etc/cont-init.d/* /etc/s6-overlay/s6-rc.d/*/*;do if [ -f $files ] && [[ ! -z $(awk '/chown.*abc:abc.*\\/,/.*\/config( |$)/{print FILENAME}' "$files") ]] ; then sed -i "s|/config$|/data|g" "$files"; fi ;done
&& for file in /etc/services.d/*/* /etc/cont-init.d/* /etc/s6-overlay/s6-rc.d/*/*;do if [ -f $files ] && [[ ! -z $(awk '/chown.*abc:abc.*\\/,/.*\/config( |$)/{print FILENAME}' $file) ]] ; then sed -i "s|/config$|/data|g" $file; fi ;done
##################
# 3 Install apps #

View File

@@ -1,4 +1,7 @@
## 25.0.0 (20-10-2022)
- Update to latest version from linuxserver/docker-nextcloud
## 24.0.6 (08-10-2022)
- Update to latest version from linuxserver/docker-nextcloud

View File

@@ -17,8 +17,8 @@
ARG BUILD_FROM
ARG BUILD_VERSION
ARG BUILD_ARCH
ARG BUILD_UPSTREAM="24.0.6"
FROM ${BUILD_FROM}
ARG BUILD_UPSTREAM="25.0.0"
FROM ${BUILD_FROM}${BUILD_UPSTREAM}
##################
# 2 Modify Image #
@@ -31,29 +31,30 @@ ENV S6_CMD_WAIT_FOR_SERVICES=1 \
ENV NEXTCLOUD_PATH="/data/config/www/nextcloud"
# Global LSIO modifications
ARG CONFIGLOCATION="/data/config"
# hadolint ignore=SC2046,SC2013,SC2086
RUN \
# Remove upstream files
rm -rf /etc/cont-init.d/10-adduser /etc/cont-init.d/30-keygen /etc/cont-init.d/40-config /etc/cont-init.d/50-install /etc/cont-init.d/60-memcache /etc/cont-init.d/70-aliases \
# Make permissions
&& chmod +x /defaults/nextcloud-perms.sh \
# default folders
&& sed -i "s|data|share/nextcloud|g" /etc/cont-init.d/* \
&& sed -i "s|config|data/config|g" /etc/cont-init.d/* \
&& sed -i "s|data|share/nextcloud|g" /etc/services.d/nginx/* \
&& sed -i "s|config|data/config|g" /etc/services.d/nginx/* \
&& sed -i "s|config|data/config|g" /defaults/* \
&& for file in $(grep -Esril "/data[ '\"/]|/data\$" /etc /defaults); do sed -Ei "s=(/data)+(/| |$|\"|\')=/share/nextcloud\2=g" $file; done \
&& for file in $(grep -Esril "/config[ '\"/]|/config\$" /etc /defaults); do sed -Ei "s=(/config)+(/| |$|\"|\')=$CONFIGLOCATION\2=g" $file; done \
# modify data limits files
# -e 's/memory_limit=512M/memory_limit=1024M/g' \
&& sed -i \
-e 's/upload_max_filesize=1024M/upload_max_filesize=10240M/g' \
-e 's/post_max_size=1024M/post_max_size=10240M/g' \
/etc/php7/php.ini \
&& sed -i "s|client_max_body_size 512M;|client_max_body_size 10240M;|g" /defaults/default \
# Correct ssl path
&& sed -i "s|/data/config/keys|/ssl/nextcloud/keys|g" /defaults/default \
/etc/php*/php.ini \
# Correct initial directory
&& sed -i "s|/data|%%datadirectory%%|g" /defaults/config.php
RUN \
# Correct ssl path
sed -i "s|/data/config/keys|/ssl/nextcloud/keys|g" /defaults/nginx/site-confs/default.conf.sample \
&& sed -i "s|client_max_body_size 512M;|client_max_body_size 10240M;|g" /defaults/nginx/site-confs/default.conf.sample
##################
# 3 Install apps #
##################

View File

@@ -1,8 +1,8 @@
{
"build_from": {
"aarch64": "lscr.io/linuxserver/nextcloud:arm64v8-latest",
"amd64": "lscr.io/linuxserver/nextcloud:amd64-latest",
"armv7": "lscr.io/linuxserver/nextcloud:arm32v7-latest"
"aarch64": "lscr.io/linuxserver/nextcloud:arm64v8-",
"amd64": "lscr.io/linuxserver/nextcloud:amd64-",
"armv7": "lscr.io/linuxserver/nextcloud:arm32v7-"
},
"codenotary": {
"signer": "alexandrep.github@gmail.com"

View File

@@ -103,6 +103,6 @@
"slug": "nextcloud_ocr",
"uart": true,
"url": "https://github.com/alexbelgium/hassio-addons/tree/master/nextcloud",
"version": "24.0.7",
"version": "25.0.0-9",
"webui": "https://[HOST]:[PORT:443]"
}

View File

@@ -41,3 +41,4 @@ chown abc:abc /data/config
chown abc:abc /defaults
rm /config/nginx/site-confs/default 2>/dev/null || true
rm /data/config/nginx/nginx.conf || true

View File

@@ -25,7 +25,7 @@ fi
#Sets certificates
echo "... adding ssl certs in files"
#Sets certificates
for NGINXFILE in "/defaults/default" "/config/nginx/site-confs/default" "/data/config/nginx/site-confs/default"; do
for NGINXFILE in "/data/config/nginx/ssl.conf" "/defaults/nginx/ssl.conf.sample" "/data/config/nginx/nginx.conf"; do
if [ -f $NGINXFILE ]; then
LINE=$(sed -n "/ssl_certificate /=" $NGINXFILE)
if [[ -n "$LINE" ]]; then

View File

@@ -34,5 +34,7 @@ for files in /defaults/config.php /data/config/www/nextcloud/config/config.php;
if [ -f "$files" ]; then
sed -i "/check_data_directory_permissions/d" "$files"
sed -i "/datadirectory/a 'check_data_directory_permissions' => false," "$files"
sed -i "/allow_local_remote_servers/d" "$files"
sed -i "/datadirectory/a 'allow_local_remote_servers' => true," "$files"
fi
done

View File

@@ -8,3 +8,8 @@ do
bash "$file"
fi
done
# Use php7
if [ -f /data/config/crontabs/root ]; then
sed -i "s|php7|php|g" /data/config/crontabs/root
fi

View File

@@ -1,8 +1,9 @@
{
"last_update": "08-10-2022",
"last_update": "20-10-2022",
"paused": true,
"repository": "alexbelgium/hassio-addons",
"slug": "nextcloud",
"source": "github",
"upstream_repo": "linuxserver/docker-nextcloud",
"upstream_version": "24.0.6"
"upstream_version": "25.0.0"
}

View File

@@ -1,4 +1,10 @@
## v21.1-ls127 (29-10-2022)
- Update to latest version from linuxserver/docker-nzbget
## v21.1-ls126 (22-10-2022)
- Update to latest version from linuxserver/docker-nzbget
## v21.1-ls125 (24-09-2022)
- Update to latest version from linuxserver/docker-nzbget

View File

@@ -33,22 +33,22 @@ RUN \
# Global LSIO modifications
ARG CONFIGLOCATION="/config/addons_config/nzbget"
# hadolint ignore=SC2015, SC2013
# hadolint ignore=SC2015, SC2013, SC2086
RUN \
# Avoid custom-init.d duplications
for file in $(grep -sril 'Potential tampering with custom' /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do rm -f "$file"; done \
for file in $(grep -sril 'Potential tampering with custom' /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do rm -f $file; done \
\
# Create new config folder if needed
&& for file in $(grep -srl "PUID" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" "$file"; done \
&& for file in $(grep -srl "PUID" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" $file; done \
\
# Allow UID and GID setting
&& for file in $(grep -srl "PUID" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' "$file" && sed -i '1a PUID="$(if bashio::config.has_value "PUID"; then bashio::config "PUID"; else echo "0"; fi)"' "$file" && sed -i '1a PGID="$(if bashio::config.has_value "PGID"; then bashio::config "PGID"; else echo "0"; fi)"' "$file"; done \
&& for file in $(grep -srl "PUID" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' $file && sed -i '1a PUID="$(if bashio::config.has_value "PUID"; then bashio::config "PUID"; else echo "0"; fi)"' $file && sed -i '1a PGID="$(if bashio::config.has_value "PGID"; then bashio::config "PGID"; else echo "0"; fi)"' $file; done \
\
# Correct config location
&& for file in $(grep -Esril "/config[ '\"/]|/config\$" /etc/logrotate.d /defaults /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do sed -Ei "s=(/config)+(/| |$|\"|\')=$CONFIGLOCATION\2=g" "$file"; done \
&& for file in $(grep -Esril "/config[ '\"/]|/config\$" /etc /defaults); do sed -Ei "s=(/config)+(/| |$|\"|\')=$CONFIGLOCATION\2=g" $file; done \
\
# Avoid chmod /config
&& for files in /etc/services.d/*/* /etc/cont-init.d/* /etc/s6-overlay/s6-rc.d/*/*;do if [ -f $files ] && [[ ! -z $(awk '/chown.*abc:abc.*\\/,/.*\/config( |$)/{print FILENAME}' "$files") ]] ; then sed -i "s|/config$|/data|g" "$files"; fi ;done
&& for file in /etc/services.d/*/* /etc/cont-init.d/* /etc/s6-overlay/s6-rc.d/*/*;do if [ -f $files ] && [[ ! -z $(awk '/chown.*abc:abc.*\\/,/.*\/config( |$)/{print FILENAME}' $file) ]] ; then sed -i "s|/config$|/data|g" $file; fi ;done
##################
# 3 Install apps #

View File

@@ -79,5 +79,5 @@
},
"slug": "nzbget",
"url": "https://github.com/alexbelgium/hassio-addons",
"version": "v21.1-ls125"
"version": "v21.1-ls127"
}

View File

@@ -1,9 +1,9 @@
{
"github_fulltag": "true",
"last_update": "24-09-2022",
"last_update": "29-10-2022",
"repository": "alexbelgium/hassio-addons",
"slug": "nzbget",
"source": "github",
"upstream_repo": "linuxserver/docker-nzbget",
"upstream_version": "v21.1-ls125"
"upstream_version": "v21.1-ls127"
}

View File

@@ -1,4 +1,16 @@
## 5.6-chromium-amd64-2022-10-28 (2022-10-28)
- Update to latest version from mbentley/omada-controller
## 5.6-chromium-amd64-2022-10-24 (2022-10-24)
- Update to latest version from mbentley/omada-controller
## 5.5-chromium-amd64-2022-10-21 (2022-10-21)
- Update to latest version from mbentley/omada-controller
## 5.5-chromium-amd64-2022-10-19 (2022-10-19)
- Update to latest version from mbentley/omada-controller
## 5.5-chromium-amd64-2022-10-17 (2022-10-17)
- Update to latest version from mbentley/omada-controller

View File

@@ -16,7 +16,7 @@
ARG BUILD_FROM
ARG BUILD_VERSION
ARG BUILD_UPSTREAM="5.5-chromium-amd64-2022-10-17"
ARG BUILD_UPSTREAM="5.6-chromium-amd64-2022-10-28"
FROM ${BUILD_FROM}
##################

View File

@@ -45,6 +45,6 @@
},
"slug": "omada",
"url": "https://github.com/alexbelgium/hassio-addons",
"version": "5.5-chromium-amd64-2022-10-17",
"version": "5.6-chromium-amd64-2022-10-28",
"webui": "[PROTO:ssl]://[HOST]:[PORT:8088]"
}

View File

@@ -1,12 +1,12 @@
#!/bin/bash
# shellcheck shell=bash
CONFIGSOURCE="/config/addons_config/omada"
CONFIGSOURCE="/data"
# Use ssl
if [ -d /ssl ]; then
mkdir -p /cert
cp /ssl/* /cert
cp /ssl/* /cert 2>/dev/null
chown -R 508:508 /cert
fi
@@ -17,21 +17,24 @@ if [ ! -f "$CONFIGSOURCE" ]; then
fi
# Ensure structure is correct
mkdir -p "$CONFIGSOURCE"/db "$CONFIGSOURCE"/html "$CONFIGSOURCE"/pdf
cp -rnf /opt/tplink/EAPController/data/* "$CONFIGSOURCE"
echo "Creating symlink"
rm -r /opt/tplink/EAPController/data/*
mkdir -p "$CONFIGSOURCE"/pdf
mkdir -p "$CONFIGSOURCE"/omada/html
mkdir -p "$CONFIGSOURCE"/db
mkdir -p "$CONFIGSOURCE"/map
mkdir -p "$CONFIGSOURCE"/portal
ln -s "$CONFIGSOURCE"/pdf /opt/tplink/EAPController/data
ln -s "$CONFIGSOURCE"/omada/html /opt/tplink/EAPController/data
ln -s "$CONFIGSOURCE"/db /opt/tplink/EAPController/data
ln -s "$CONFIGSOURCE"/map /opt/tplink/EAPController/data
ln -s "$CONFIGSOURCE"/portal /opt/tplink/EAPController/data
# Make sure permissions are right
echo "Updating permissions"
chmod -R 777 "$CONFIGSOURCE"
chown -R "508:508" "$CONFIGSOURCE"
# Delete previous directories
echo "Removing previous directories"
rm -r /opt/tplink/EAPController/data/html
rm -r /opt/tplink/EAPController/data/pdf
rm -r /opt/tplink/EAPController/data/db
# Create symlink
echo "Creating symlink"
ln -s /config/addons_config/omada/pdf /opt/tplink/EAPController/data/pdf
ln -s /config/addons_config/omada/html /opt/tplink/EAPController/data/html
ln -s /config/addons_config/omada/db /opt/tplink/EAPController/data/db

View File

@@ -1,9 +1,9 @@
{
"dockerhub_by_date": true,
"last_update": "2022-10-17",
"last_update": "2022-10-28",
"repository": "alexbelgium/hassio-addons",
"slug": "omada",
"source": "dockerhub",
"upstream_repo": "mbentley/omada-controller",
"upstream_version": "5.5-chromium-amd64-2022-10-17"
"upstream_version": "5.6-chromium-amd64-2022-10-28"
}

View File

@@ -1,4 +1,16 @@
## 5.6-chromium-amd64-2022-10-28 (2022-10-28)
- Update to latest version from mbentley/omada-controller
## 5.6-chromium-amd64-2022-10-24 (2022-10-24)
- Update to latest version from mbentley/omada-controller
## 5.5-chromium-amd64-2022-10-21 (2022-10-21)
- Update to latest version from mbentley/omada-controller
## 5.5-chromium-amd64-2022-10-19 (2022-10-19)
- Update to latest version from mbentley/omada-controller
## 5.5-chromium-amd64-2022-10-17 (2022-10-17)
- Update to latest version from mbentley/omada-controller

View File

@@ -16,7 +16,7 @@
ARG BUILD_FROM
ARG BUILD_VERSION
ARG BUILD_UPSTREAM="5.5-chromium-amd64-2022-10-17"
ARG BUILD_UPSTREAM="5.6-chromium-amd64-2022-10-28"
FROM ${BUILD_FROM}
##################

View File

@@ -45,6 +45,6 @@
},
"slug": "omada_v3",
"url": "https://github.com/alexbelgium/hassio-addons",
"version": "5.5-chromium-amd64-2022-10-17",
"version": "5.6-chromium-amd64-2022-10-28",
"webui": "[PROTO:ssl]://[HOST]:[PORT:8088]"
}

View File

@@ -3,6 +3,13 @@
CONFIGSOURCE="/data"
# Use ssl
if [ -d /ssl ]; then
mkdir -p /cert
cp /ssl/* /cert 2>/dev/null
chown -R 508:508 /cert
fi
# Create directory
if [ ! -d "$CONFIGSOURCE" ]; then
echo "Creating directory"

View File

@@ -1,9 +1,9 @@
{
"dockerhub_by_date": true,
"last_update": "2022-10-17",
"last_update": "2022-10-28",
"repository": "alexbelgium/hassio-addons",
"slug": "omada_v3",
"source": "dockerhub",
"upstream_repo": "mbentley/omada-controller",
"upstream_version": "5.5-chromium-amd64-2022-10-17"
"upstream_version": "5.6-chromium-amd64-2022-10-28"
}

View File

@@ -29,22 +29,22 @@ ENV S6_CMD_WAIT_FOR_SERVICES=1 \
# Global LSIO modifications
ARG CONFIGLOCATION="/config/addons_config/ombi"
# hadolint ignore=SC2015, SC2013
# hadolint ignore=SC2015, SC2013, SC2086
RUN \
# Avoid custom-init.d duplications
for file in $(grep -sril 'Potential tampering with custom' /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do rm -f "$file"; done \
for file in $(grep -sril 'Potential tampering with custom' /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do rm -f $file; done \
\
# Create new config folder if needed
&& for file in $(grep -srl "PUID" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" "$file"; done \
&& for file in $(grep -srl "PUID" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" $file; done \
\
# Allow UID and GID setting
&& for file in $(grep -srl "PUID" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' "$file" && sed -i '1a PUID="$(if bashio::config.has_value "PUID"; then bashio::config "PUID"; else echo "0"; fi)"' "$file" && sed -i '1a PGID="$(if bashio::config.has_value "PGID"; then bashio::config "PGID"; else echo "0"; fi)"' "$file"; done \
&& for file in $(grep -srl "PUID" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' $file && sed -i '1a PUID="$(if bashio::config.has_value "PUID"; then bashio::config "PUID"; else echo "0"; fi)"' $file && sed -i '1a PGID="$(if bashio::config.has_value "PGID"; then bashio::config "PGID"; else echo "0"; fi)"' $file; done \
\
# Correct config location
&& for file in $(grep -Esril "/config[ '\"/]|/config\$" /etc/logrotate.d /defaults /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do sed -Ei "s=(/config)+(/| |$|\"|\')=$CONFIGLOCATION\2=g" "$file"; done \
&& for file in $(grep -Esril "/config[ '\"/]|/config\$" /etc /defaults); do sed -Ei "s=(/config)+(/| |$|\"|\')=$CONFIGLOCATION\2=g" $file; done \
\
# Avoid chmod /config
&& for files in /etc/services.d/*/* /etc/cont-init.d/* /etc/s6-overlay/s6-rc.d/*/*;do if [ -f $files ] && [[ ! -z $(awk '/chown.*abc:abc.*\\/,/.*\/config( |$)/{print FILENAME}' "$files") ]] ; then sed -i "s|/config$|/data|g" "$files"; fi ;done
&& for file in /etc/services.d/*/* /etc/cont-init.d/* /etc/s6-overlay/s6-rc.d/*/*;do if [ -f $files ] && [[ ! -z $(awk '/chown.*abc:abc.*\\/,/.*\/config( |$)/{print FILENAME}' $file) ]] ; then sed -i "s|/config$|/data|g" $file; fi ;done
##################
# 3 Install apps #

View File

@@ -28,22 +28,22 @@ ENV S6_CMD_WAIT_FOR_SERVICES=1 \
# Global LSIO modifications
ARG CONFIGLOCATION="/data/organizr"
# hadolint ignore=SC2015, SC2013
# hadolint ignore=SC2015, SC2013, SC2086
RUN \
# Avoid custom-init.d duplications
for file in $(grep -sril 'Potential tampering with custom' /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do rm -f "$file"; done \
for file in $(grep -sril 'Potential tampering with custom' /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do rm -f $file; done \
\
# Create new config folder if needed
&& for file in $(grep -srl "PUID" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" "$file"; done \
&& for file in $(grep -srl "PUID" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" $file; done \
\
# Allow UID and GID setting
&& for file in $(grep -srl "PUID" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' "$file" && sed -i '1a PUID="$(if bashio::config.has_value "PUID"; then bashio::config "PUID"; else echo "0"; fi)"' "$file" && sed -i '1a PGID="$(if bashio::config.has_value "PGID"; then bashio::config "PGID"; else echo "0"; fi)"' "$file"; done \
&& for file in $(grep -srl "PUID" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' $file && sed -i '1a PUID="$(if bashio::config.has_value "PUID"; then bashio::config "PUID"; else echo "0"; fi)"' $file && sed -i '1a PGID="$(if bashio::config.has_value "PGID"; then bashio::config "PGID"; else echo "0"; fi)"' $file; done \
\
# Correct config location
&& for file in $(grep -Esril "/config[ '\"/]|/config\$" /etc/logrotate.d /defaults /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do sed -Ei "s=(/config)+(/| |$|\"|\')=$CONFIGLOCATION\2=g" "$file"; done \
&& for file in $(grep -Esril "/config[ '\"/]|/config\$" /etc /defaults); do sed -Ei "s=(/config)+(/| |$|\"|\')=$CONFIGLOCATION\2=g" $file; done \
\
# Avoid chmod /config
&& for files in /etc/services.d/*/* /etc/cont-init.d/* /etc/s6-overlay/s6-rc.d/*/*;do if [ -f $files ] && [[ ! -z $(awk '/chown.*abc:abc.*\\/,/.*\/config( |$)/{print FILENAME}' "$files") ]] ; then sed -i "s|/config$|/data|g" "$files"; fi ;done
&& for file in /etc/services.d/*/* /etc/cont-init.d/* /etc/s6-overlay/s6-rc.d/*/*;do if [ -f $files ] && [[ ! -z $(awk '/chown.*abc:abc.*\\/,/.*\/config( |$)/{print FILENAME}' $file) ]] ; then sed -i "s|/config$|/data|g" $file; fi ;done
##################
# 3 Install apps #

View File

@@ -30,22 +30,22 @@ ENV S6_CMD_WAIT_FOR_SERVICES=1 \
# Global LSIO modifications
ARG CONFIGLOCATION="/config/addons_config/overseerr"
# hadolint ignore=SC2015, SC2013
# hadolint ignore=SC2015, SC2013, SC2086
RUN \
# Avoid custom-init.d duplications
for file in $(grep -sril 'Potential tampering with custom' /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do rm -f "$file"; done \
for file in $(grep -sril 'Potential tampering with custom' /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do rm -f $file; done \
\
# Create new config folder if needed
&& for file in $(grep -srl "PUID" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" "$file"; done \
&& for file in $(grep -srl "PUID" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" $file; done \
\
# Allow UID and GID setting
&& for file in $(grep -srl "PUID" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' "$file" && sed -i '1a PUID="$(if bashio::config.has_value "PUID"; then bashio::config "PUID"; else echo "0"; fi)"' "$file" && sed -i '1a PGID="$(if bashio::config.has_value "PGID"; then bashio::config "PGID"; else echo "0"; fi)"' "$file"; done \
&& for file in $(grep -srl "PUID" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' $file && sed -i '1a PUID="$(if bashio::config.has_value "PUID"; then bashio::config "PUID"; else echo "0"; fi)"' $file && sed -i '1a PGID="$(if bashio::config.has_value "PGID"; then bashio::config "PGID"; else echo "0"; fi)"' $file; done \
\
# Correct config location
&& for file in $(grep -Esril "/config[ '\"/]|/config\$" /etc/logrotate.d /defaults /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do sed -Ei "s=(/config)+(/| |$|\"|\')=$CONFIGLOCATION\2=g" "$file"; done \
&& for file in $(grep -Esril "/config[ '\"/]|/config\$" /etc /defaults); do sed -Ei "s=(/config)+(/| |$|\"|\')=$CONFIGLOCATION\2=g" $file; done \
\
# Avoid chmod /config
&& for files in /etc/services.d/*/* /etc/cont-init.d/* /etc/s6-overlay/s6-rc.d/*/*;do if [ -f $files ] && [[ ! -z $(awk '/chown.*abc:abc.*\\/,/.*\/config( |$)/{print FILENAME}' "$files") ]] ; then sed -i "s|/config$|/data|g" "$files"; fi ;done
&& for file in /etc/services.d/*/* /etc/cont-init.d/* /etc/s6-overlay/s6-rc.d/*/*;do if [ -f $files ] && [[ ! -z $(awk '/chown.*abc:abc.*\\/,/.*\/config( |$)/{print FILENAME}' $file) ]] ; then sed -i "s|/config$|/data|g" $file; fi ;done
##################
# 3 Install apps #

View File

@@ -1,89 +1,122 @@
## 1.9.2 (02-11-2022)
- Update to latest version from paperless-ngx/paperless-ngx
- BACKUP BEFORE UPDATE : switch to paperless-ngx image. Please backup before switch.
## v1.8.0-ls30 (24-09-2022)
- Update to latest version from linuxserver/docker-paperless-ngx
## v1.8.0-ls29 (17-09-2022)
- Update to latest version from linuxserver/docker-paperless-ngx
## v1.8.0-ls28 (09-09-2022)
- Update to latest version from linuxserver/docker-paperless-ngx
## v1.8.0-ls27 (02-09-2022)
- Update to latest version from linuxserver/docker-paperless-ngx
## v1.8.0-ls26 (20-08-2022)
- Update to latest version from linuxserver/docker-paperless-ngx
## v1.8.0-ls25 (11-08-2022)
- Update to latest version from linuxserver/docker-paperless-ngx
## v1.7.1-ls24 (23-07-2022)
- Update to latest version from linuxserver/docker-paperless-ngx
## v1.7.1-ls23 (16-07-2022)
- Update to latest version from linuxserver/docker-paperless-ngx
## v1.7.1-ls22 (09-07-2022)
- Update to latest version from linuxserver/docker-paperless-ngx
## v1.7.1-ls21 (07-07-2022)
- Update to latest version from linuxserver/docker-paperless-ngx
## v1.7.1-ls20 (02-07-2022)
- Update to latest version from linuxserver/docker-paperless-ngx
## v1.7.1-ls19 (25-06-2022)
- Update to latest version from linuxserver/docker-paperless-ngx
## v1.7.1-ls18 (18-06-2022)
- Update to latest version from linuxserver/docker-paperless-ngx
## v1.7.1-ls17 (11-06-2022)
- Update to latest version from linuxserver/docker-paperless-ngx
## v1.7.1-ls16 (04-06-2022)
- Update to latest version from linuxserver/docker-paperless-ngx
## v1.7.1-ls15 (31-05-2022)
- Update to latest version from linuxserver/docker-paperless-ngx
## v1.7.1-ls14 (19-05-2022)
- Update to latest version from linuxserver/docker-paperless-ngx
## v1.7.1-ls13 (17-05-2022)
- Update to latest version from linuxserver/docker-paperless-ngx
## v1.7.1-ls12 (14-05-2022)
- Update to latest version from linuxserver/docker-paperless-ngx
## v1.7.1-ls10 (12-05-2022)
- Update to latest version from linuxserver/docker-paperless-ngx
## ngx-1.7.0-ls9 (10-05-2022)
- Update to latest version from linuxserver/docker-paperless-ngx
## ngx-1.7.0-ls8 (06-05-2022)
- Update to latest version from linuxserver/docker-paperless-ngx
## ngx-1.7.0-ls7 (01-05-2022)
- Update to latest version from linuxserver/docker-paperless-ngx
## ngx-1.7.0-ls6 (29-04-2022)
- Update to latest version from linuxserver/docker-paperless-ngx
## ngx-1.7.0-ls5 (27-04-2022)
- Update to latest version from linuxserver/docker-paperless-ngx
## ngx-1.6.0-ls4 (14-04-2022)
- Update to latest version from linuxserver/docker-paperless-ngx
## ngx-1.6.0-ls3 (09-04-2022)
- Update to latest version from linuxserver/docker-paperless-ngx
## ngx-1.6.0-ls2 (02-04-2022)
- Update to latest version from linuxserver/docker-paperless-ngx
## ngx-1.6.0-ls1 (28-03-2022)
- Update to latest version from linuxserver/docker-paperless-ngx
- Major change : switch to paperless NGX
- Add codenotary sign

View File

@@ -16,7 +16,8 @@
ARG BUILD_FROM
ARG BUILD_VERSION
FROM ${BUILD_FROM}
ARG BUILD_UPSTREAM="1.9.2"
FROM ${BUILD_FROM}${BUILD_UPSTREAM}
##################
# 2 Modify Image #
@@ -27,25 +28,6 @@ ENV S6_CMD_WAIT_FOR_SERVICES=1 \
S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0 \
S6_SERVICES_GRACETIME=0
# Global LSIO modifications
ARG CONFIGLOCATION="/config/addons_config/paperless_ng"
# hadolint ignore=SC2015, SC2013
RUN \
# Avoid custom-init.d duplications
for file in $(grep -sril 'Potential tampering with custom' /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do rm -f "$file"; done \
\
# Create new config folder if needed
&& for file in $(grep -srl "PUID" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" "$file"; done \
\
# Allow UID and GID setting
&& for file in $(grep -srl "PUID" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' "$file" && sed -i '1a PUID="$(if bashio::config.has_value "PUID"; then bashio::config "PUID"; else echo "0"; fi)"' "$file" && sed -i '1a PGID="$(if bashio::config.has_value "PGID"; then bashio::config "PGID"; else echo "0"; fi)"' "$file"; done \
\
# Correct config location
&& for file in $(grep -Esril "/config[ '\"/]|/config\$" /etc/logrotate.d /defaults /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do sed -Ei "s=(/config)+(/| |$|\"|\')=$CONFIGLOCATION\2=g" "$file"; done \
\
# Avoid chmod /config
&& for files in /etc/services.d/*/* /etc/cont-init.d/* /etc/s6-overlay/s6-rc.d/*/*;do if [ -f $files ] && [[ ! -z $(awk '/chown.*abc:abc.*\\/,/.*\/config( |$)/{print FILENAME}' "$files") ]] ; then sed -i "s|/config$|/data|g" "$files"; fi ;done
##################
# 3 Install apps #
##################
@@ -58,6 +40,25 @@ RUN if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \
if [ -f /entrypoint.sh ]; then chmod 755 /entrypoint.sh; fi
ENV \
PAPERLESS_DATA_DIR=/config/addons_config/paperless_ng \
PAPERLESS_MEDIA_ROOT=/config/addons_config/paperless_ng/media \
PAPERLESS_CONSUMPTION_DIR=/config/addons_config/paperless_ng/consume
# Modify image
# hadolint ignore=SC2016
RUN \
sed -i 's|usr/bin/env bash|usr/bin/env bashio|g' /sbin/docker-entrypoint.sh && \
# Run entrypoint
sed -i '2i /./entrypoint.sh' /sbin/docker-entrypoint.sh && \
# Set variables
sed -i '2i bashio::log.info "Defining variables"' /sbin/docker-entrypoint.sh && \
sed -i '2i if bashio::config.has_value "PUID"; then export USERMAP_UID=$(bashio::config "PUID"); fi' /sbin/docker-entrypoint.sh && \
sed -i '2i if bashio::config.has_value "PGID"; then export USERMAP_GID=$(bashio::config "PGID"); fi' /sbin/docker-entrypoint.sh && \
sed -i '2i if bashio::config.has_value "TZ"; then export PAPERLESS_TIME_ZONE=$(bashio::config "TZ"); fi' /sbin/docker-entrypoint.sh && \
sed -i '2i if bashio::config.has_value "OCRLANG"; then export PAPERLESS_OCR_LANGUAGES=$(bashio::config "OCRLANG"); fi' /sbin/docker-entrypoint.sh && \
sed -i '2i if bashio::config.has_value "PAPERLESS_OCR_MODE"; then export PAPERLESS_OCR_MODE=$(bashio::config "PAPERLESS_OCR_MODE"); fi' /sbin/docker-entrypoint.sh
# Modules
ARG MODULES="00-banner.sh 92-local_mounts.sh 92-smb_mounts.sh 90-config_yaml.sh"
@@ -70,9 +71,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get
&& chmod -R 755 /etc/cont-init.d || printf '%s\n' "${MODULES}" >/MODULESFILE
# Manual apps
ENV PACKAGES="yamllint \
pip \
libxml2-dev libxslt-dev python-dev libjpeg-dev zlib1g-dev python3-dev build-essential"
ENV PACKAGES="redis-server yamllint pip libxml2-dev libxslt-dev python-dev libjpeg-dev zlib1g-dev python3-dev build-essential"
# Automatic apps & bashio
# hadolint ignore=SC2015
@@ -88,10 +87,10 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get
# 4 Entrypoint #
################
#RUN chmod 777 /entrypoint.sh
RUN chmod 777 /entrypoint.sh
#WORKDIR /
#ENTRYPOINT [ "/usr/bin/env" ]
#CMD [ "/entrypoint.sh" ]
#ENTRYPOINT [ "/entrypoint.sh" ]
#SHELL ["/bin/bash", "-o", "pipefail", "-c"]
############

View File

@@ -1,8 +1,8 @@
{
"build_from": {
"aarch64": "lscr.io/linuxserver/paperless-ngx:arm64v8-latest",
"amd64": "lscr.io/linuxserver/paperless-ngx:amd64-latest",
"armv7": "lscr.io/linuxserver/paperless-ngx:arm32v7-latest"
"aarch64": "ghcr.io/paperless-ngx/paperless-ngx:",
"amd64": "ghcr.io/paperless-ngx/paperless-ngx:",
"armv7": "ghcr.io/paperless-ngx/paperless-ngx:"
},
"codenotary": {
"signer": "alexandrep.github@gmail.com"

View File

@@ -56,7 +56,9 @@
"options": {
"CONFIG_LOCATION": "/config/addons_config/paperless_ng/config.yaml",
"PGID": 0,
"PUID": 0
"PUID": 0,
"PAPERLESS_OCR_MODE": "skip",
"OCRLANG": "ENG"
},
"ports": {
"8000/tcp": 8011
@@ -74,6 +76,7 @@
"PGID": "int",
"PUID": "int",
"TZ": "str?",
"PAPERLESS_OCR_MODE": "list(skip|redo|force|skip_noarchive)?",
"cifspassword": "str?",
"cifsusername": "str?",
"localdisks": "str?",
@@ -81,6 +84,6 @@
},
"slug": "paperless_ng",
"url": "https://github.com/alexbelgium/hassio-addons",
"version": "v1.8.0-ls30",
"version": "1.9.2",
"webui": "[PROTO:ssl]://[HOST]:[PORT:8000]"
}

View File

@@ -0,0 +1,27 @@
#!/bin/bash
echo "Starting..."
############################
# Backup Dockerfile Script #
############################
if [ -f /etc/cont-init.d/00-aaa_dockerfile_backup.sh ]; then
chown "$(id -u)":"$(id -g)" /etc/cont-init.d/00-aaa_dockerfile_backup.sh
chmod +x /etc/cont-init.d/00-aaa_dockerfile_backup.sh
/./etc/cont-init.d/00-aaa_dockerfile_backup.sh
rm /etc/cont-init.d/00-aaa_dockerfile_backup.sh
fi
####################
# Starting scripts #
####################
for SCRIPTS in /etc/cont-init.d/*; do
[ -e "$SCRIPTS" ] || continue
echo "$SCRIPTS: executing"
chown "$(id -u)":"$(id -g)" "$SCRIPTS"
chmod a+x "$SCRIPTS"
# Change shebang if no s6 supervision
sed -i 's|/usr/bin/with-contenv bashio|/usr/bin/env bashio|g' "$SCRIPTS"
/."$SCRIPTS" || echo "$SCRIPTS: exiting $?"
done

View File

@@ -4,16 +4,9 @@
slug=paperless_ng
if [ ! -d /config/addons_config/$slug ]; then
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/
rm -r /config/$slug
fi
echo "Creating /config/addons_config/$slug"
mkdir -p /config/addons_config/$slug
chmod 777 /config/addons_config/$slug
fi
chmod -R 755 /config/addons_config/$slug
chown -R paperless:paperless /config/addons_config/$slug

View File

@@ -1,14 +0,0 @@
#!/usr/bin/with-contenv bashio
# shellcheck shell=bash
echo "Installing pikepdf..."
(
export DEBIAN_FRONTEND="noninteractive"
export TERM="xterm-256color"
apt-get update
apt-get install -yq libxml2-dev libxslt-dev python-dev
apt-get install -yq libjpeg-dev zlib1g-dev
apt-get install -yq python3-dev build-essential
pip install pikepdf --force-reinstall
) >/dev/null
echo "... success!"

Some files were not shown because too many files have changed in this diff Show More