diff --git a/CHANGELOG.md b/CHANGELOG.md index a6b65ed..eb81f93 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +## 6.2.19 2023-03-25 + + ### Added + - Add libldap to alpine Dockerfile + + ## 6.2.18 2023-03-23 ### Changed diff --git a/Dockerfile b/Dockerfile index 930b70c..a959433 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,8 @@ -ARG DISTRO=alpine -ARG DISTRO_VARIANT=3.17 +#ARG DISTRO=alpine +#ARG DISTRO_VARIANT=3.17 -FROM docker.io/tiredofit/${DISTRO}:${DISTRO_VARIANT} +#FROM docker.io/tiredofit/${DISTRO}:${DISTRO_VARIANT} +FROM tiredofit/alpine:develop LABEL maintainer="Dave Conroy (github.com/tiredofit)" ARG NGINX_VERSION @@ -41,7 +42,7 @@ RUN case "$(cat /etc/os-release | grep VERSION_ID | cut -d = -f 2 | cut -d . -f tar \ zlib-dev \ && \ - \ + \ package install .brotli-build-deps \ autoconf \ automake \ @@ -141,6 +142,7 @@ RUN case "$(cat /etc/os-release | grep VERSION_ID | cut -d = -f 2 | cut -d . -f $runDeps \ apache2-utils \ inotify-tools \ + libldap \ && \ \ mkdir -p /etc/nginx/snippets/blockbots && \ diff --git a/install/assets/functions/10-nginx b/install/assets/functions/10-nginx index 4d371ad..6a53584 100755 --- a/install/assets/functions/10-nginx +++ b/install/assets/functions/10-nginx @@ -612,8 +612,8 @@ nginx_site_enable() { if [ "$(ls -A /etc/nginx/sites.available/)" ]; then shopt -s nullglob for site in /etc/nginx/sites.available/*.conf; do - print_debug "Enabling Nginx Site '$(basename ${site})'" - ln -sf /etc/nginx/sites.available/"$(basename ${site})" /etc/nginx/sites.enabled/ + print_debug "Enabling Nginx Site '$(basename "${site}")'" + ln -sf /etc/nginx/sites.available/"$(basename "${site}")" /etc/nginx/sites.enabled/ done shopt -u nullglob fi @@ -636,8 +636,8 @@ nginx_site_disable() { if [ "${1,,}" = "all" ] ; then shopt -s nullglob for site in /etc/nginx/sites.enabled/*.conf; do - print_debug "Disabling Nginx Site '$(basename ${site})" - rm -rf /etc/nginx/sites.enabled/"$(basename ${site})" + print_debug "Disabling Nginx Site '$(basename "${site}")" + rm -rf /etc/nginx/sites.enabled/"$(basename "${site}")" done shopt -u nullglob else