Skip to content

Commit

Permalink
Updating the gpg key for packages.nginx.org (#97)
Browse files Browse the repository at this point in the history
* Updating the gpg key for packages.nginx.org

* Updating modulesdir to start unitd properly

---------

Co-authored-by: Mathijs Westerhof <mathijs.westerhof@belsimpel.nl>
  • Loading branch information
mathijswesterhof and Mathijs Westerhof authored Nov 27, 2023
1 parent 474f071 commit 3c0b01b
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
5 changes: 3 additions & 2 deletions nginx-regex-tester/regextester/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion nginx-regex-tester/regextester/start.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 3c0b01b

Please sign in to comment.