avm/hassio-addons
1
0
Fork 0
mirror of https://github.com/alexbelgium/hassio-addons.git synced 2026-05-28 19:34:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

add ca-certificates update by default

Browse Source
This commit is contained in:
Alexandre
2022-06-09 21:40:31 +02:00
parent 518cf5ebf3
commit 28f90f2af7
132 changed files with 147 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
guacamole/Dockerfile
View File

@@ -25,7 +25,7 @@ FROM ${BUILD_FROM}
ENV PGDATA=/config/addons_config/guacamole/postgres
ENV GUACAMOLE_HOME=/config/addons_config/guacamole
WORKDIR /config/addons_config/guacamole
# hadolint ignore=SC2016
RUN \
# Change config location
@@ -38,15 +38,15 @@ RUN \
&& sed -i 's|cp -rn /app/guacamole|cp -rn /app/guacamole/*|g' /etc/cont-init.d/* \
# avoid error
&& sed -i 's|(cat /config/.database-version)|(cat /config/.database-version &>/dev/null)|g' /etc/cont-init.d/* \
&& sed -i 's|(cat /config/.database-version)|(cat /config/.database-version &>/dev/null)|g' /etc/services.d/*/run
&& sed -i 's|(cat /config/.database-version)|(cat /config/.database-version &>/dev/null)|g' /etc/services.d/*/run
# Avoid timeouts
#RUN sed -i 's|-t3000|-t300000|g' /etc/s6-overlay/s6-rc.d/*/run
#Allow UID and GID setting
#RUN sed -i 's|/config|/data|g' /etc/cont-init.d/* \
# && sed -i 's|/config|/data|g' /etc/services.d/*/run
# Change log location
# Change log location
# && find / -name *syslog* -type f | xargs sed -i "s|/dev/log|/data/log|g"
##################
@@ -62,9 +62,10 @@ ARG MODULES="00-banner.sh"
# 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 \
&& 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 \
&& apt-get update && apt-get install -yqq --no-install-recommends ca-certificates || apk add --no-cache ca-certificates >/dev/null || true; fi \
&& 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 \
&& chmod -R 755 /etc/cont-init.d
&& chmod -R 755 /etc/cont-init.d || printf '%s\n' "${MODULES}" >/MODULESFILE
# Manual apps
ENV PACKAGES=""