From 3c0b01bf38a7402f5797c375383da58b2f230861 Mon Sep 17 00:00:00 2001 From: Resdac <10096922+mathijswesterhof@users.noreply.github.com> Date: Mon, 27 Nov 2023 23:07:19 +0100 Subject: [PATCH] Updating the gpg key for packages.nginx.org (#97) * Updating the gpg key for packages.nginx.org * Updating modulesdir to start unitd properly --------- Co-authored-by: Mathijs Westerhof --- nginx-regex-tester/regextester/Dockerfile | 5 +++-- nginx-regex-tester/regextester/start.sh | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/nginx-regex-tester/regextester/Dockerfile b/nginx-regex-tester/regextester/Dockerfile index 48f12baa..86348889 100644 --- a/nginx-regex-tester/regextester/Dockerfile +++ b/nginx-regex-tester/regextester/Dockerfile @@ -6,12 +6,13 @@ 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 -O - https://unit.nginx.org/keys/nginx-keyring.gpg | gpg --dearmor > /usr/share/keyrings/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 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/ `lsb_release -cs` unit" >> /etc/apt/sources.list.d/unit.list RUN apt-get update && apt-get install -y unit php7.0 unit-php COPY regextester.php /usr/share/nginx/html diff --git a/nginx-regex-tester/regextester/start.sh b/nginx-regex-tester/regextester/start.sh index 632c18d9..e53a5a27 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 --modulesdir /usr/lib/unit/modules/ --log /var/log/unit.log i=$(curl --unix-socket /run/control.unit.sock -s -o /dev/null -w "%{http_code}" localhost/config) if [ "$i" != "200" ]; then