From ca9b0cccf31aa50abc98d6181888a4a8470ea734 Mon Sep 17 00:00:00 2001 From: Zoey Date: Wed, 3 May 2023 16:29:25 +0200 Subject: [PATCH 1/3] optimze domaincheck Dockerfile Signed-off-by: Zoey --- Containers/domaincheck/Dockerfile | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/Containers/domaincheck/Dockerfile b/Containers/domaincheck/Dockerfile index 3077ff7f..8003bfab 100644 --- a/Containers/domaincheck/Dockerfile +++ b/Containers/domaincheck/Dockerfile @@ -1,18 +1,15 @@ FROM alpine:3.17.3 -RUN apk add --no-cache lighttpd bash netcat-openbsd - -RUN adduser -S www-data -G www-data -RUN rm -rf /etc/lighttpd/lighttpd.conf -COPY lighttpd.conf /etc/lighttpd/lighttpd.conf -RUN chmod +r -R /etc/lighttpd && \ +RUN apk add --no-cache bash lighttpd netcat-openbsd; \ + adduser -S www-data -G www-data; \ + rm -rf /etc/lighttpd/lighttpd.conf; \ + chmod +r -R /etc/lighttpd && \ chown www-data:www-data -R /var/www && \ - chown www-data:www-data /etc/lighttpd/lighttpd.conf + mkdir -p /var/www/domaincheck +COPY --chown=www-data:www-data lighttpd.conf /etc/lighttpd/lighttpd.conf -COPY start.sh / -RUN chmod +x /start.sh +COPY --chmod=775 start.sh /start.sh USER www-data -RUN mkdir -p /var/www/domaincheck/ ENTRYPOINT ["/start.sh"] HEALTHCHECK CMD nc -z localhost $APACHE_PORT || exit 1 From 234590f8ee939dc7cb292ab41d703320f07208ed Mon Sep 17 00:00:00 2001 From: Zoey Date: Wed, 3 May 2023 17:02:07 +0200 Subject: [PATCH 2/3] add set -ex Co-authored-by: Simon L. Signed-off-by: Zoey --- Containers/domaincheck/Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Containers/domaincheck/Dockerfile b/Containers/domaincheck/Dockerfile index 8003bfab..7c180425 100644 --- a/Containers/domaincheck/Dockerfile +++ b/Containers/domaincheck/Dockerfile @@ -1,5 +1,6 @@ FROM alpine:3.17.3 -RUN apk add --no-cache bash lighttpd netcat-openbsd; \ +RUN set -ex; \ + apk add --no-cache bash lighttpd netcat-openbsd; \ adduser -S www-data -G www-data; \ rm -rf /etc/lighttpd/lighttpd.conf; \ chmod +r -R /etc/lighttpd && \ From 12d351aa19fa34f1a09dfc338ae6b5452c177493 Mon Sep 17 00:00:00 2001 From: Simon L Date: Wed, 3 May 2023 17:27:55 +0200 Subject: [PATCH 3/3] apply suggestion Signed-off-by: Simon L --- Containers/domaincheck/Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Containers/domaincheck/Dockerfile b/Containers/domaincheck/Dockerfile index 7c180425..fc7264ef 100644 --- a/Containers/domaincheck/Dockerfile +++ b/Containers/domaincheck/Dockerfile @@ -3,9 +3,9 @@ RUN set -ex; \ apk add --no-cache bash lighttpd netcat-openbsd; \ adduser -S www-data -G www-data; \ rm -rf /etc/lighttpd/lighttpd.conf; \ - chmod +r -R /etc/lighttpd && \ - chown www-data:www-data -R /var/www && \ - mkdir -p /var/www/domaincheck + chmod +r -R /etc/lighttpd; \ + mkdir -p /var/www/domaincheck; \ + chown www-data:www-data -R /var/www COPY --chown=www-data:www-data lighttpd.conf /etc/lighttpd/lighttpd.conf COPY --chmod=775 start.sh /start.sh