Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
docker-nginx
Manage
Activity
Members
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Model registry
Analyze
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
GitHub Mirror
nginxinc
docker-nginx
Commits
33588b16
Commit
33588b16
authored
1 year ago
by
Konstantin Pavlov
Committed by
Konstantin Pavlov
1 year ago
Browse files
Options
Downloads
Patches
Plain Diff
Updated remaining Dockerfiles after
b7a32965
.
parent
3fb7e2e6
No related branches found
No related tags found
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
stable/alpine-otel/Dockerfile
+2
-13
2 additions, 13 deletions
stable/alpine-otel/Dockerfile
stable/debian-otel/Dockerfile
+2
-19
2 additions, 19 deletions
stable/debian-otel/Dockerfile
with
4 additions
and
32 deletions
stable/alpine-otel/Dockerfile
+
2
−
13
View file @
33588b16
...
...
@@ -23,17 +23,7 @@ RUN set -x \
&& case "$apkArch" in \
x86_64|aarch64) \
# arches officially built by upstream
set -x \
&& KEY_SHA512="e09fa32f0a0eab2b879ccbbc4d0e4fb9751486eedda75e35fac65802cc9faa266425edf83e261137a2f4d16281ce2c1a5f4502930fe75154723da014214f0655" \
&& wget -O /tmp/nginx_signing.rsa.pub https://nginx.org/keys/nginx_signing.rsa.pub \
&& if echo "$KEY_SHA512 */tmp/nginx_signing.rsa.pub" | sha512sum -c -; then \
echo "key verification succeeded!"; \
mv /tmp/nginx_signing.rsa.pub /etc/apk/keys/; \
else \
echo "key verification failed!"; \
exit 1; \
fi \
&& apk add -X "https://nginx.org/packages/alpine/v$(egrep -o '^[0-9]+\.[0-9]+' /etc/alpine-release)/main" --no-cache $nginxPackages \
apk add -X "https://nginx.org/packages/alpine/v$(egrep -o '^[0-9]+\.[0-9]+' /etc/alpine-release)/main" --no-cache $nginxPackages \
;; \
*) \
# we're on an architecture upstream doesn't officially build for
...
...
@@ -83,5 +73,4 @@ RUN set -x \
&& apk del --no-network .checksum-deps \
# if we have leftovers from building, let's purge them (including extra, unnecessary build deps)
&& if [ -n "$tempDir" ]; then rm -rf "$tempDir"; fi \
&& if [ -f "/etc/apk/keys/abuild-key.rsa.pub" ]; then rm -f /etc/apk/keys/abuild-key.rsa.pub; fi \
&& if [ -f "/etc/apk/keys/nginx_signing.rsa.pub" ]; then rm -f /etc/apk/keys/nginx_signing.rsa.pub; fi
&& if [ -f "/etc/apk/keys/abuild-key.rsa.pub" ]; then rm -f /etc/apk/keys/abuild-key.rsa.pub; fi
This diff is collapsed.
Click to expand it.
stable/debian-otel/Dockerfile
+
2
−
19
View file @
33588b16
...
...
@@ -7,26 +7,9 @@ FROM nginx:1.26.0
ENV
OTEL_VERSION 0.1.0
RUN
set
-x
\
&&
apt-get update
\
&&
apt-get
install
--no-install-recommends
--no-install-suggests
-y
gnupg1 ca-certificates
\
&&
\
NGINX_GPGKEY
=
573BFD6B3D8FBC641079A6ABABF5BD827BD9BF62
;
\
RUN
set
-x
;
\
NGINX_GPGKEY_PATH
=
/usr/share/keyrings/nginx-archive-keyring.gpg
;
\
export
GNUPGHOME
=
"
$(
mktemp
-d
)
"
;
\
found
=
''
;
\
for
server
in
\
hkp://keyserver.ubuntu.com:80
\
pgp.mit.edu
\
;
do
\
echo
"Fetching GPG key
$NGINX_GPGKEY
from
$server
"
;
\
gpg1
--keyserver
"
$server
"
--keyserver-options
timeout
=
10
--recv-keys
"
$NGINX_GPGKEY
"
&&
found
=
yes
&&
break
;
\
done
;
\
test
-z
"
$found
"
&&
echo
>
&2
"error: failed to fetch GPG key
$NGINX_GPGKEY
"
&&
exit
1
;
\
gpg1
--export
"
$NGINX_GPGKEY
"
>
"
$NGINX_GPGKEY_PATH
"
;
\
rm
-rf
"
$GNUPGHOME
"
;
\
apt-get remove
--purge
--auto-remove
-y
gnupg1
&&
rm
-rf
/var/lib/apt/lists/
*
\
&&
dpkgArch
=
"
$(
dpkg
--print-architecture
)
"
\
dpkgArch
=
"
$(
dpkg
--print-architecture
)
"
\
&&
nginxPackages
=
"
\
nginx=
${
NGINX_VERSION
}
-
${
PKG_RELEASE
}
\
nginx-module-xslt=
${
NGINX_VERSION
}
-
${
PKG_RELEASE
}
\
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment