mirror of
https://github.com/alexbelgium/hassio-addons.git
synced 2026-06-03 22:34:11 +02:00
Update Dockerfile
This commit is contained in:
@@ -22,11 +22,6 @@ FROM ${BUILD_FROM}
|
|||||||
# 2 Modify Image #
|
# 2 Modify Image #
|
||||||
##################
|
##################
|
||||||
|
|
||||||
# Set S6 wait time
|
|
||||||
ENV S6_CMD_WAIT_FOR_SERVICES=1 \
|
|
||||||
S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0 \
|
|
||||||
S6_SERVICES_GRACETIME=0
|
|
||||||
|
|
||||||
##################
|
##################
|
||||||
# 3 Install apps #
|
# 3 Install apps #
|
||||||
##################
|
##################
|
||||||
@@ -40,7 +35,7 @@ RUN if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
|
|||||||
if [ -f /entrypoint.sh ]; then chmod 755 /entrypoint.sh; fi
|
if [ -f /entrypoint.sh ]; then chmod 755 /entrypoint.sh; fi
|
||||||
|
|
||||||
# Modules
|
# Modules
|
||||||
ARG MODULES="00-banner.sh 01-custom_script.sh 00-local_mounts.sh 00-smb_mounts.sh 90-dns_set.sh"
|
ARG MODULES=""
|
||||||
|
|
||||||
# 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 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 \
|
||||||
@@ -51,7 +46,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get
|
|||||||
&& chmod -R 755 /etc/cont-init.d
|
&& chmod -R 755 /etc/cont-init.d
|
||||||
|
|
||||||
# Manual apps
|
# Manual apps
|
||||||
ENV PACKAGES="nginx engrampa"
|
ENV PACKAGES=""
|
||||||
|
|
||||||
# Automatic apps & bashio
|
# Automatic apps & bashio
|
||||||
# hadolint ignore=SC2015
|
# hadolint ignore=SC2015
|
||||||
@@ -66,11 +61,6 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get
|
|||||||
# 4 Entrypoint #
|
# 4 Entrypoint #
|
||||||
################
|
################
|
||||||
|
|
||||||
#WORKDIR /
|
|
||||||
#ENTRYPOINT [ "/usr/bin/env" ]
|
|
||||||
#CMD [ "/entrypoint.sh" ]
|
|
||||||
#SHELL ["/bin/bash", "-o", "pipefail", "-c"]
|
|
||||||
|
|
||||||
############
|
############
|
||||||
# 5 Labels #
|
# 5 Labels #
|
||||||
############
|
############
|
||||||
|
|||||||
Reference in New Issue
Block a user