diff --git a/nginx-regex-tester/regextester/Dockerfile b/nginx-regex-tester/regextester/Dockerfile index 48f12baa..c68a77af 100644 --- a/nginx-regex-tester/regextester/Dockerfile +++ b/nginx-regex-tester/regextester/Dockerfile @@ -4,15 +4,14 @@ COPY start.sh /usr/local/sbin RUN chmod +x /usr/local/sbin/start.sh RUN apt-get update && apt-get install -y -q wget curl apt-transport-https lsb-release ca-certificates gnupg - -RUN wget -q -O - http://nginx.org/keys/nginx_signing.key | gpg --dearmor > /usr/share/keyrings/nginx-archive-keyring.gpg +RUN wget -q -P /usr/share/keyrings https://unit.nginx.org/keys/nginx-keyring.gpg RUN rm /etc/nginx/conf.d/* COPY regextester.conf /etc/nginx/conf.d -RUN printf "deb https://packages.nginx.org/unit/debian/ `lsb_release -cs` unit" > /etc/apt/sources.list.d/unit.list -RUN printf "deb-src https://packages.nginx.org/unit/debian/ `lsb_release -cs` unit" >> /etc/apt/sources.list.d/unit.list -RUN apt-get update && apt-get install -y unit php7.0 unit-php +RUN printf "deb [signed-by=/usr/share/keyrings/nginx-keyring.gpg] https://packages.nginx.org/unit/debian/ `lsb_release -cs` unit" > /etc/apt/sources.list.d/unit.list +RUN printf "deb-src [signed-by=/usr/share/keyrings/nginx-keyring.gpg] https://packages.nginx.org/unit/debian/ bookworm unit" >> /etc/apt/sources.list.d/unit.list +RUN apt-get update && apt-get install -y unit php unit-php COPY regextester.php /usr/share/nginx/html COPY unitphp.config /srv diff --git a/nginx-regex-tester/regextester/start.sh b/nginx-regex-tester/regextester/start.sh index 632c18d9..d1366712 100755 --- a/nginx-regex-tester/regextester/start.sh +++ b/nginx-regex-tester/regextester/start.sh @@ -10,7 +10,7 @@ fi echo "NGINX started" -unitd --modules /usr/lib/unit/modules/ --log /var/log/unit.log +unitd --control unix:/run/control.unit.sock i=$(curl --unix-socket /run/control.unit.sock -s -o /dev/null -w "%{http_code}" localhost/config) if [ "$i" != "200" ]; then