avm/hassio-addons
1
0
Fork 0
mirror of https://github.com/alexbelgium/hassio-addons.git synced 2026-05-15 05:11:49 +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

4
readarr/CHANGELOG.md
View File

@@ -1,3 +1,7 @@
## nightly-0.1.0.1117-ls52 (12-12-2021)
- Update to latest version from linuxserver/docker-readarr
- New standardized logic for Dockerfile build and packages installation
- Allow to define the config location
## nightly-0.1.0.1095-ls51 (09-12-2021)

38
readarr/Dockerfile
View File

@@ -1,15 +1,15 @@
###############
# Build Image #
###############
#################
# 1 Build Image #
#################
ARG BUILD_FROM
ARG BUILD_VERSION
FROM ${BUILD_FROM}
ENV BASHIO_VERSION=0.14.3
################
# Modify Image #
################
##################
# 2 Modify Image #
##################
RUN sed -i "s|/config|/config/readarr|g" /etc/services.d/readarr/run \
&& sed -i "s|/config|/config/readarr|g" /etc/cont-init.d/30-config \
@@ -19,9 +19,9 @@ RUN sed -i "s|/config|/config/readarr|g" /etc/services.d/readarr/run \
&& sed -i 's/{PUID:-911}/(bashio::config "PUID")/g' /etc/cont-init.d/10-adduser \
&& sed -i 's/{PGID:-911}/(bashio::config "PGID")/g' /etc/cont-init.d/10-adduser
################
# Install apps #
################
##################
# 3 Install apps #
##################
# Copy local files
COPY rootfs/ /
@@ -30,25 +30,25 @@ COPY rootfs/ /
ENV PACKAGES=""
# 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 #
################
#RUN chmod 777 /entrypoint.sh
#WORKDIR /
#ENTRYPOINT [ "/usr/bin/env" ]
#CMD [ "/entrypoint.sh" ]
##########
# Labels #
##########
############
# 5 Labels #
############
ARG BUILD_ARCH
ARG BUILD_DATE

4
readarr/config.json
View File

@@ -73,8 +73,8 @@
"CONFIG_LOCATION": "str"
},
"slug": "readarr_nas",
"upstream": "nightly-0.1.0.1095-ls51",
"upstream": "nightly-0.1.0.1117-ls52",
"url": "https://github.com/alexbelgium/hassio-addons",
"version": "nightly-0.1.0.1095-ls51-4",
"version": "nightly-0.1.0.1117-ls52",
"webui": "http://[HOST]:[PORT:8787]"
}

15
readarr/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh
View File

@@ -2,18 +2,17 @@
# 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 && \
chmod 777 /automatic_packages.sh && \
eval /./automatic_packages.sh "$PACKAGES" && \
rm /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 &&
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 &&
eval /./automatic_packages.sh "$PACKAGES" &&
rm /automatic_packages.sh
) >/dev/null
fi