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

New logic

Browse Source
This commit is contained in:
Alexandre
2021-12-14 13:39:15 +01:00
parent 6df150b341
commit 90f333c40d
269 changed files with 6071 additions and 2163 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
qbittorrent/CHANGELOG.md
View File

@@ -1,3 +1,6 @@
- Removed watchdog
- New standardized logic for Dockerfile build and packages installation
- Allow mounting nvme
- Allow mounting local drives by label. Just pust the label instead of sda1 for example
## 14.3.9.99202110311443-7435-01519b5e7ubuntu20.04.1-ls159 (31-10-2021)

37
qbittorrent/Dockerfile
View File

@@ -1,14 +1,14 @@
###############
# Build Image #
###############
#################
# 1 Build Image #
#################
ARG BUILD_FROM
ARG BUILD_VERSION
FROM ${BUILD_FROM}
################
# Modify Image #
################
##################
# 2 Modify Image #
##################
# Environment variables
ENV \
@@ -20,9 +20,6 @@ ENV \
TERM="xterm-256color"
RUN \
########################################
# Correct upstream image folders links #
########################################
# 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 \
@@ -40,9 +37,9 @@ RUN \
&& echo 'WebUI\HostHeaderValidation=false' >> /defaults/qBittorrent.conf \
&& echo 'WebUI\LocalHostAuth=false' >> /defaults/qBittorrent.conf || true
################
# Install apps #
################
##################
# 3 Install apps #
##################
# Copy local files
COPY rootfs/ /
@@ -58,20 +55,20 @@ ENV PACKAGES="jq \
openvpn"
# Automatic apps & bashio
RUN $(ls /bin/bash &>/dev/null) || (apt-get install -y --no-install-recommends bash || apk add --no-cache bash) && \
$(curl --help &>/dev/null) || (apt-get install -y --no-install-recommends curl || apk add --no-cache curl) && \
RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash); fi && \
if ! command -v curl >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends curl || apk add --no-cache curl); fi && \
curl -L -f -s "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/zzz_templates/automatic_packages.sh" --output /automatic_packages.sh && \
chmod 777 /automatic_packages.sh && \
/automatic_packages.sh "${PACKAGES:-}" && \
rm /automatic_packages.sh || printf '%s\n' "${PACKAGES:-}" > /ENVFILE
##############
# Entrypoint #
##############
################
# 4 Entrypoint #
################
##########
# Labels #
##########
############
# 5 Labels #
############
ARG BUILD_ARCH
ARG BUILD_DATE

3
qbittorrent/config.json
View File

@@ -98,7 +98,6 @@
"slug": "qbittorrent",
"upstream": "14.3.9.99202110311443-7435-01519b5e7ubuntu20.04.1-ls159",
"url": "https://github.com/alexbelgium/hassio-addons",
"version": "14.3.9.99202110311443-7435-01519b5e7ubuntu20.04.1-ls160",
"watchdog": "[PROTO:ssl]://[HOST]:[PORT:8080]",
"version": "14.3.9.99202110311443-7435-01519b5e7ubuntu20.04.1-ls160-2",
"webui": "[PROTO:ssl]://[HOST]:[PORT:8080]"
}

8
qbittorrent/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh
View File

@@ -2,14 +2,14 @@
# If dockerfile failed install manually
if [ -e "/ENVFILE" ]; then
echo "Executing script"
PACKAGES=$(< /ENVFILE)
PACKAGES=$(</ENVFILE)
(
#######################
# Automatic installer #
#######################
$(ls /bin/bash &>/dev/null) || (apt-get install -y --no-install-recommends bash || apk add --no-cache bash) && \
$(curl --help &>/dev/null) || (apt-get install -y --no-install-recommends curl &>/dev/null || apk add --no-cache curl) && \
curl -L -f -s "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/zzz_templates/automatic_packages.sh" --output /automatic_packages.sh && \
if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash); fi && \
$(curl --help &>/dev/null) || (apt-get update && apt-get install -yqq --no-install-recommends curl &>/dev/null || apk add --no-cache curl) && \
curl -L -f -s "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/zzz_templates/automatic_packages.sh" --output /automatic_packages.sh && \
chmod 777 /automatic_packages.sh && \
eval /./automatic_packages.sh "$PACKAGES" && \
rm /automatic_packages.sh