From 9c5d758de36299b4e6498539bb7561c193364897 Mon Sep 17 00:00:00 2001 From: Paul Buetow Date: Tue, 3 Feb 2026 23:13:35 +0200 Subject: fix registry --- docker-image/Dockerfile | 10 ++++++++-- docker-image/Justfile | 4 ++-- 2 files changed, 10 insertions(+), 4 deletions(-) (limited to 'docker-image') diff --git a/docker-image/Dockerfile b/docker-image/Dockerfile index 00a212b..a17d264 100644 --- a/docker-image/Dockerfile +++ b/docker-image/Dockerfile @@ -9,6 +9,7 @@ RUN apk update && apk add --no-cache \ RUN sed -i 's/#LoadModule cgid_module/LoadModule cgid_module/' /usr/local/apache2/conf/httpd.conf && \ sed -i 's/#LoadModule cgi_module/LoadModule cgi_module/' /usr/local/apache2/conf/httpd.conf && \ sed -i 's/#LoadModule remoteip_module/LoadModule remoteip_module/' /usr/local/apache2/conf/httpd.conf && \ + sed -i 's/^Listen 80$/Listen 8080/' /usr/local/apache2/conf/httpd.conf && \ echo 'ScriptAlias /cgi-bin/ "/usr/local/apache2/cgi-bin/"' >> /usr/local/apache2/conf/httpd.conf && \ echo '' >> /usr/local/apache2/conf/httpd.conf && \ echo ' AllowOverride None' >> /usr/local/apache2/conf/httpd.conf && \ @@ -26,10 +27,15 @@ RUN sed -i 's/#LoadModule cgid_module/LoadModule cgid_module/' /usr/local/apache COPY index.pl /usr/local/apache2/cgi-bin/index.pl RUN chmod 755 /usr/local/apache2/cgi-bin/index.pl +# Run as non-root +RUN addgroup -S app && adduser -S -G app app && \ + chown -R app:app /usr/local/apache2/logs /usr/local/apache2/htdocs /usr/local/apache2/cgi-bin /usr/local/apache2/conf +USER app + # Create a redirect from / to /cgi-bin/index.pl RUN echo 'Redirecting...

Redirecting to IPv6 Test...

' > /usr/local/apache2/htdocs/index.html -EXPOSE 80 +EXPOSE 8080 HEALTHCHECK --interval=30s --timeout=10s --start-period=5s --retries=3 \ - CMD wget -qO- http://127.0.0.1:80/ || exit 1 + CMD wget -qO- http://127.0.0.1:8080/ || exit 1 diff --git a/docker-image/Justfile b/docker-image/Justfile index 5a8b49b..f28bfdd 100644 --- a/docker-image/Justfile +++ b/docker-image/Justfile @@ -1,5 +1,5 @@ -VERSION := "1.6.0" -REGISTRY := "registry.lan.buetow.org:30001" +VERSION := "1.6.1" +REGISTRY := "r0.lan.buetow.org:30001" IMAGE := "ipv6test" # Build the Docker image -- cgit v1.2.3