mirror of
https://github.com/alexbelgium/hassio-addons.git
synced 2026-05-24 09:41:50 +02:00
Remove Nginx installation and update MODULES
Removed Nginx installation from Dockerfile and updated MODULES argument.
This commit is contained in:
@@ -33,25 +33,6 @@ SHELL ["/bin/bash", "-o", "pipefail", "-c"]
|
|||||||
COPY --from=vaultwarden /vaultwarden /opt/vaultwarden
|
COPY --from=vaultwarden /vaultwarden /opt/vaultwarden
|
||||||
COPY --from=vaultwarden /web-vault /opt/web-vault
|
COPY --from=vaultwarden /web-vault /opt/web-vault
|
||||||
|
|
||||||
# add Nginx
|
|
||||||
# hadolint ignore=DL3009
|
|
||||||
RUN \
|
|
||||||
apt-get update \
|
|
||||||
\
|
|
||||||
&& apt-get install -y --no-install-recommends \
|
|
||||||
libmariadb-dev \
|
|
||||||
libpq5 \
|
|
||||||
nginx \
|
|
||||||
sqlite3 \
|
|
||||||
&& apt-get clean \
|
|
||||||
&& rm -f -r \
|
|
||||||
/etc/nginx \
|
|
||||||
\
|
|
||||||
&& mkdir -p /var/log/nginx \
|
|
||||||
&& touch /var/log/nginx/error.log &&
|
|
||||||
\
|
|
||||||
chmod +x /etc/s6-overlay/s6-rc.d/*/run
|
|
||||||
|
|
||||||
##################
|
##################
|
||||||
# 2 Modify Image #
|
# 2 Modify Image #
|
||||||
##################
|
##################
|
||||||
@@ -68,13 +49,15 @@ ENV S6_CMD_WAIT_FOR_SERVICES=1 \
|
|||||||
# Add rootfs
|
# Add rootfs
|
||||||
COPY rootfs/ /
|
COPY rootfs/ /
|
||||||
|
|
||||||
|
RUN chmod +x /etc/s6-overlay/s6-rc.d/*/run
|
||||||
|
|
||||||
# Uses /bin for compatibility purposes
|
# Uses /bin for compatibility purposes
|
||||||
# hadolint ignore=DL4005
|
# hadolint ignore=DL4005
|
||||||
RUN if [ ! -f /bin/sh ] && [ -f /usr/bin/sh ]; then ln -s /usr/bin/sh /bin/sh; fi && \
|
RUN if [ ! -f /bin/sh ] && [ -f /usr/bin/sh ]; then ln -s /usr/bin/sh /bin/sh; fi && \
|
||||||
if [ ! -f /bin/bash ] && [ -f /usr/bin/bash ]; then ln -s /usr/bin/bash /bin/bash; fi
|
if [ ! -f /bin/bash ] && [ -f /usr/bin/bash ]; then ln -s /usr/bin/bash /bin/bash; fi
|
||||||
|
|
||||||
# Modules
|
# Modules
|
||||||
ARG MODULES="00-banner.sh 01-custom_script.sh 00-deprecated.sh"
|
ARG MODULES="00-banner.sh 01-custom_script.sh"
|
||||||
|
|
||||||
# Automatic modules download
|
# Automatic modules download
|
||||||
ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_automodules.sh" "/ha_automodules.sh"
|
ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_automodules.sh" "/ha_automodules.sh"
|
||||||
|
|||||||
Reference in New Issue
Block a user