From b6b31e440c7915e82fe8b9a4b93083ec9fb2e9fd Mon Sep 17 00:00:00 2001 From: Kirmy Date: Thu, 9 Dec 2021 13:09:09 +0100 Subject: [PATCH] Replaced darkhttpd with lighttpd --- Dockerfile | 7 ++++--- Dockerfile.arm32v7 | 7 ++++--- Dockerfile.arm64v8 | 7 ++++--- entrypoint.sh | 4 +++- lighttpd.conf | 20 ++++++++++++++++++++ 5 files changed, 35 insertions(+), 10 deletions(-) create mode 100644 lighttpd.conf diff --git a/Dockerfile b/Dockerfile index 0a43027..f24d7be 100644 --- a/Dockerfile +++ b/Dockerfile @@ -12,18 +12,19 @@ RUN yarn build # production stage FROM alpine:3.15 -ENV USER darkhttpd -ENV GROUP darkhttpd +ENV USER lighttpd +ENV GROUP lighttpd ENV GID 911 ENV UID 911 ENV PORT 8080 RUN addgroup -S ${GROUP} -g ${GID} && adduser -D -S -u ${UID} ${USER} ${GROUP} && \ - apk add -U --no-cache su-exec darkhttpd + apk add -U --no-cache lighttpd COPY --from=build-stage --chown=${USER}:${GROUP} /app/dist /www/ COPY --from=build-stage --chown=${USER}:${GROUP} /app/dist/assets /www/default-assets COPY entrypoint.sh /entrypoint.sh +COPY lighttpd.conf /lighttpd.conf HEALTHCHECK --interval=30s --timeout=5s --retries=3 \ CMD wget --no-verbose --tries=1 --spider http://127.0.0.1:${PORT}/ || exit 1 diff --git a/Dockerfile.arm32v7 b/Dockerfile.arm32v7 index 95a2db1..2256d2a 100644 --- a/Dockerfile.arm32v7 +++ b/Dockerfile.arm32v7 @@ -21,19 +21,20 @@ FROM arm32v7/alpine:3.11 COPY --from=qemu qemu-arm-static /usr/bin/ -ENV USER darkhttpd -ENV GROUP darkhttpd +ENV USER lighttpd +ENV GROUP lighttpd ENV GID 911 ENV UID 911 ENV PORT 8080 RUN addgroup -S ${GROUP} -g ${GID} && adduser -D -S -u ${UID} ${USER} ${GROUP} && \ - apk add -U --no-cache darkhttpd su-exec && \ + apk add -U --no-cache lighttpd && \ rm /usr/bin/qemu-arm-static COPY --from=build-stage --chown=${USER}:${GROUP} /app/dist /www/ COPY --from=build-stage --chown=${USER}:${GROUP} /app/dist/assets /www/default-assets COPY entrypoint.sh /entrypoint.sh +COPY lighttpd.conf /lighttpd.conf HEALTHCHECK --interval=30s --timeout=5s --retries=3 \ CMD wget --no-verbose --tries=1 --spider http://127.0.0.1:${PORT}/ || exit 1 diff --git a/Dockerfile.arm64v8 b/Dockerfile.arm64v8 index cd15e4a..7d772f0 100644 --- a/Dockerfile.arm64v8 +++ b/Dockerfile.arm64v8 @@ -21,19 +21,20 @@ FROM arm64v8/alpine:3.11 COPY --from=qemu qemu-aarch64-static /usr/bin/ -ENV USER darkhttpd -ENV GROUP darkhttpd +ENV USER lighttpd +ENV GROUP lighttpd ENV GID 911 ENV UID 911 ENV PORT 8080 RUN addgroup -S ${GROUP} -g ${GID} && adduser -D -S -u ${UID} ${USER} ${GROUP} && \ - apk add -U --no-cache darkhttpd su-exec && \ + apk add -U --no-cache lighttpd && \ rm /usr/bin/qemu-aarch64-static COPY --from=build-stage --chown=${USER}:${GROUP} /app/dist /www/ COPY --from=build-stage --chown=${USER}:${GROUP} /app/dist/assets /www/default-assets COPY entrypoint.sh /entrypoint.sh +COPY lighttpd.conf /lighttpd.conf HEALTHCHECK --interval=30s --timeout=5s --retries=3 \ CMD wget --no-verbose --tries=1 --spider http://127.0.0.1:${PORT}/ || exit 1 diff --git a/entrypoint.sh b/entrypoint.sh index 9da2615..e10e17e 100644 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -18,4 +18,6 @@ if [[ -n "${SUBFOLDER}" ]]; then fi chown -R $UID:$GID /www/assets -exec su-exec $UID:$GID darkhttpd /www/ --no-listing --port "$PORT" + +echo "Starting webserver" +lighttpd -D -f /lighttpd.conf diff --git a/lighttpd.conf b/lighttpd.conf new file mode 100644 index 0000000..da72bf9 --- /dev/null +++ b/lighttpd.conf @@ -0,0 +1,20 @@ +# Minimal config by Kirmy34 + +include "/etc/lighttpd/mime-types.conf" + +server.port = 8080 + +server.username = "lighttpd" +server.groupname = "lighttpd" + +server.document-root = "/www" +server.pid-file = "/run/lighttpd.pid" + +server.indexfiles = ("index.php", "index.html", "index.htm", "default.htm") + +server.follow-symlink = "enable" + +static-file.exclude-extensions = (".php", ".pl", ".cgi", ".fcgi") + +url.access-deny = ("~", ".inc") + -- 2.41.0