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

Merge branch 'master' of https://github.com/alexbelgium/hassio-addons

Browse Source
This commit is contained in:
Alexandre
2022-11-02 17:39:48 +01:00
parent c22b5d4f92 3b6fc0ed8b
commit c7f78059dd
166 changed files with 879 additions and 551 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
calibre_web/CHANGELOG.md
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

12
calibre_web/Dockerfile
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 \

2
calibre_web/config.json
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
}

4
calibre_web/updater.json
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"
}