Skip to content

Commit 3c0b01b

Browse files
mathijswesterhofMathijs Westerhof
and
Mathijs Westerhof
authored
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 <[email protected]>
1 parent 474f071 commit 3c0b01b

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

nginx-regex-tester/regextester/Dockerfile

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,13 @@ RUN chmod +x /usr/local/sbin/start.sh
66
RUN apt-get update && apt-get install -y -q wget curl apt-transport-https lsb-release ca-certificates gnupg
77

88
RUN wget -q -O - http://nginx.org/keys/nginx_signing.key | gpg --dearmor > /usr/share/keyrings/nginx-archive-keyring.gpg
9+
RUN wget -q -O - https://unit.nginx.org/keys/nginx-keyring.gpg | gpg --dearmor > /usr/share/keyrings/nginx-keyring.gpg
910

1011
RUN rm /etc/nginx/conf.d/*
1112
COPY regextester.conf /etc/nginx/conf.d
1213

13-
RUN printf "deb https://packages.nginx.org/unit/debian/ `lsb_release -cs` unit" > /etc/apt/sources.list.d/unit.list
14-
RUN printf "deb-src https://packages.nginx.org/unit/debian/ `lsb_release -cs` unit" >> /etc/apt/sources.list.d/unit.list
14+
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
15+
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
1516
RUN apt-get update && apt-get install -y unit php7.0 unit-php
1617

1718
COPY regextester.php /usr/share/nginx/html

nginx-regex-tester/regextester/start.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ fi
1010

1111
echo "NGINX started"
1212

13-
unitd --modules /usr/lib/unit/modules/ --log /var/log/unit.log
13+
unitd --modulesdir /usr/lib/unit/modules/ --log /var/log/unit.log
1414

1515
i=$(curl --unix-socket /run/control.unit.sock -s -o /dev/null -w "%{http_code}" localhost/config)
1616
if [ "$i" != "200" ]; then

0 commit comments

Comments
 (0)