Skip to content

Commit 905bf4d

Browse files
authored
Update debian build stages to use gpg over sq (#5664)
1 parent 978fd40 commit 905bf4d

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

build/Dockerfile

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -165,13 +165,13 @@ RUN --mount=type=secret,id=nginx-repo.crt,dst=/etc/ssl/nginx/nginx-repo.crt,mode
165165
--mount=type=bind,from=nginx-files,src=90pkgs-nginx,target=/etc/apt/apt.conf.d/90pkgs-nginx \
166166
--mount=type=bind,from=nginx-files,src=debian-plus-12.sources,target=/etc/apt/sources.list.d/nginx-plus.sources \
167167
apt-get update \
168-
&& apt-get install --no-install-recommends --no-install-suggests -y sq ca-certificates libcap2-bin libcurl4 \
168+
&& apt-get install --no-install-recommends --no-install-suggests -y gpg ca-certificates libcap2-bin libcurl4 \
169169
&& groupadd --system --gid 101 nginx \
170170
&& useradd --system --gid nginx --no-create-home --home-dir /nonexistent --comment "nginx user" --shell /bin/false --uid 101 nginx \
171-
&& sq dearmor -o /usr/share/keyrings/nginx-archive-keyring.gpg /tmp/nginx_signing.key \
171+
&& gpg --dearmor -o /usr/share/keyrings/nginx-archive-keyring.gpg /tmp/nginx_signing.key \
172172
&& apt-get update \
173173
&& apt-get install --no-install-recommends --no-install-suggests -y nginx-plus nginx-plus-module-njs nginx-plus-module-opentracing nginx-plus-module-fips-check \
174-
&& apt-get purge --auto-remove -y sq \
174+
&& apt-get purge --auto-remove -y gpg \
175175
&& cp -av /tmp/ot/usr/local/lib/libjaegertracing*so* /tmp/ot/usr/local/lib/libzipkin*so* /tmp/ot/usr/local/lib/libdd*so* /tmp/ot/usr/local/lib/libyaml*so* /usr/local/lib/ \
176176
&& ldconfig \
177177
&& rm -rf /var/lib/apt/lists/*
@@ -199,11 +199,11 @@ RUN --mount=type=secret,id=nginx-repo.crt,dst=/etc/ssl/nginx/nginx-repo.crt,mode
199199
cp /tmp/app-protect-dos.sources /etc/apt/sources.list.d/app-protect-dos.sources; \
200200
fi \
201201
&& apt-get update \
202-
&& apt-get install --no-install-recommends --no-install-suggests -y ca-certificates sq \
202+
&& apt-get install --no-install-recommends --no-install-suggests -y ca-certificates gpg \
203203
&& groupadd --system --gid 101 nginx \
204204
&& useradd --system --gid nginx --no-create-home --home-dir /nonexistent --comment "nginx user" --shell /bin/false --uid 101 nginx \
205-
&& sq dearmor -o /usr/share/keyrings/nginx-archive-keyring.gpg /tmp/nginx_signing.key \
206-
&& sq dearmor -o /usr/share/keyrings/app-protect-archive-keyring.gpg /tmp/app-protect-security-updates.key \
205+
&& gpg --dearmor -o /usr/share/keyrings/nginx-archive-keyring.gpg /tmp/nginx_signing.key \
206+
&& gpg --dearmor -o /usr/share/keyrings/app-protect-archive-keyring.gpg /tmp/app-protect-security-updates.key \
207207
&& apt-get update \
208208
&& apt-get install --no-install-recommends --no-install-suggests -y nginx-plus nginx-plus-module-njs nginx-plus-module-opentracing nginx-plus-module-fips-check libcap2-bin libcurl4 \
209209
## end of duplicated code
@@ -214,7 +214,7 @@ RUN --mount=type=secret,id=nginx-repo.crt,dst=/etc/ssl/nginx/nginx-repo.crt,mode
214214
&& if [ -z "${NAP_MODULES##*dos*}" ]; then \
215215
apt-get install --no-install-recommends --no-install-suggests -y app-protect-dos; \
216216
fi \
217-
&& apt-get purge --auto-remove -y sq \
217+
&& apt-get purge --auto-remove -y gpg \
218218
## the code below is duplicated from the debian-plus image because NAP doesn't support debian 12
219219
&& cp -av /tmp/ot/usr/local/lib/libjaegertracing*so* /tmp/ot/usr/local/lib/libzipkin*so* /tmp/ot/usr/local/lib/libdd*so* /tmp/ot/usr/local/lib/libyaml*so* /usr/local/lib/ \
220220
&& ldconfig \

0 commit comments

Comments
 (0)