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

Update Dockerfile

Browse Source
This commit is contained in:
Alexandre
2022-03-09 19:59:45 +01:00
committed by GitHub
parent 72c0c94880
commit 98d0bc76fa
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
zoneminder/Dockerfile
View File

@@ -28,6 +28,8 @@ ENV DZM_CONFIG_DIR="/config/addons_config/zoneminder"
ENV PUID=0 ENV PUID=0
ENV PGID=0 ENV PGID=0
# Set shell
SHELL ["/bin/bash", "-o", "pipefail", "-c"]
# hadolint ignore=DL4006 # hadolint ignore=DL4006
RUN sed -i 's|/config|/config/addons_config/zoneminder|g' /etc/cont-init.d/* RUN sed -i 's|/config|/config/addons_config/zoneminder|g' /etc/cont-init.d/*
@@ -43,7 +45,8 @@ COPY rootfs/ /
ARG MODULES="00-banner.sh 00-global_var.sh" ARG MODULES="00-banner.sh 00-global_var.sh"
# Automatic modules download # Automatic modules download
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) >/dev/null; fi \ RUN set -x && \
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) >/dev/null; 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) >/dev/null; 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) >/dev/null; fi \
&& mkdir -p /etc/cont-init.d \ && mkdir -p /etc/cont-init.d \
&& for scripts in $MODULES; do echo "$scripts" && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/$scripts" -o /etc/cont-init.d/"$scripts" && [ "$(sed -n '/\/bin/p;q' /etc/cont-init.d/"$scripts")" != "" ] || (echo "script failed to install $scripts" && exit 1); done \ && for scripts in $MODULES; do echo "$scripts" && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/$scripts" -o /etc/cont-init.d/"$scripts" && [ "$(sed -n '/\/bin/p;q' /etc/cont-init.d/"$scripts")" != "" ] || (echo "script failed to install $scripts" && exit 1); done \
@@ -53,7 +56,8 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get
ENV PACKAGES="" ENV PACKAGES=""
# Automatic apps & bashio # Automatic apps & bashio
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) >/dev/null; fi \ RUN set -x && \
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) >/dev/null; 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) >/dev/null; 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) >/dev/null; fi \
&& curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/automatic_packages.sh" --output /automatic_packages.sh \ && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/automatic_packages.sh" --output /automatic_packages.sh \
&& chmod 777 /automatic_packages.sh \ && chmod 777 /automatic_packages.sh \
@@ -65,9 +69,9 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get
################ ################
RUN set -x && \ RUN set -x && \
apk add --repository=http://dl-cdn.alpinelinux.org/alpine/edge/community/ \ apt-get update && apt-get install -y dos2unix && \
dos2unix && \ chmod -R +x /etc/cont-init.d/* \
chmod -R +x /etc/cont-init.d/* dos2unix /etc/cont-init.d/*
#RUN chmod 777 /entrypoint.sh #RUN chmod 777 /entrypoint.sh
ENTRYPOINT [ "/init" ] ENTRYPOINT [ "/init" ]