Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions Dockerfile-alpine-otel.template
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
FROM nginx:%%NGINX_VERSION%%-alpine

LABEL org.opencontainers.image.source="https://github.com/nginx/nginx"

ENV OTEL_VERSION %%OTEL_VERSION%%

RUN set -x \
Expand Down
2 changes: 2 additions & 0 deletions Dockerfile-alpine-perl.template
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
FROM nginx:%%NGINX_VERSION%%-alpine

LABEL org.opencontainers.image.source="https://github.com/nginx/nginx"

RUN set -x \
&& apkArch="$(cat /etc/apk/arch)" \
&& nginxPackages="%%PACKAGES%%
Expand Down
1 change: 1 addition & 0 deletions Dockerfile-alpine-slim.template
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
FROM alpine:%%ALPINE_VERSION%%

LABEL maintainer="NGINX Docker Maintainers <[email protected]>"
LABEL org.opencontainers.image.source="https://github.com/nginx/nginx"

ENV NGINX_VERSION %%NGINX_VERSION%%
ENV PKG_RELEASE %%PKG_RELEASE%%
Expand Down
2 changes: 2 additions & 0 deletions Dockerfile-alpine.template
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
FROM nginx:%%NGINX_VERSION%%-alpine-slim

LABEL org.opencontainers.image.source="https://github.com/nginx/nginx"

ENV NJS_VERSION %%NJS_VERSION%%
ENV NJS_RELEASE %%NJS_RELEASE%%

Expand Down
2 changes: 2 additions & 0 deletions Dockerfile-debian-otel.template
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
FROM nginx:%%NGINX_VERSION%%

LABEL org.opencontainers.image.source="https://github.com/nginx/nginx"

ENV OTEL_VERSION %%OTEL_VERSION%%

RUN set -x; \
Expand Down
2 changes: 2 additions & 0 deletions Dockerfile-debian-perl.template
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
FROM nginx:%%NGINX_VERSION%%

LABEL org.opencontainers.image.source="https://github.com/nginx/nginx"

RUN set -x; \
NGINX_GPGKEY_PATH=/etc/apt/keyrings/nginx-archive-keyring.gpg; \
dpkgArch="$(dpkg --print-architecture)" \
Expand Down
1 change: 1 addition & 0 deletions Dockerfile-debian.template
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
FROM debian:%%DEBIAN_VERSION%%-slim

LABEL maintainer="NGINX Docker Maintainers <[email protected]>"
LABEL org.opencontainers.image.source="https://github.com/nginx/nginx"

ENV NGINX_VERSION %%NGINX_VERSION%%
ENV NJS_VERSION %%NJS_VERSION%%
Expand Down
2 changes: 2 additions & 0 deletions mainline/alpine-otel/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@
#
FROM nginx:1.29.4-alpine

LABEL org.opencontainers.image.source="https://github.com/nginx/nginx"

ENV OTEL_VERSION 0.1.2

RUN set -x \
Expand Down
2 changes: 2 additions & 0 deletions mainline/alpine-perl/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@
#
FROM nginx:1.29.4-alpine

LABEL org.opencontainers.image.source="https://github.com/nginx/nginx"

RUN set -x \
&& apkArch="$(cat /etc/apk/arch)" \
&& nginxPackages=" \
Expand Down
1 change: 1 addition & 0 deletions mainline/alpine-slim/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
FROM alpine:3.23

LABEL maintainer="NGINX Docker Maintainers <[email protected]>"
LABEL org.opencontainers.image.source="https://github.com/nginx/nginx"

ENV NGINX_VERSION 1.29.4
ENV PKG_RELEASE 1
Expand Down
2 changes: 2 additions & 0 deletions mainline/alpine/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@
#
FROM nginx:1.29.4-alpine-slim

LABEL org.opencontainers.image.source="https://github.com/nginx/nginx"

ENV NJS_VERSION 0.9.4
ENV NJS_RELEASE 1

Expand Down
2 changes: 2 additions & 0 deletions mainline/debian-otel/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@
#
FROM nginx:1.29.4

LABEL org.opencontainers.image.source="https://github.com/nginx/nginx"

ENV OTEL_VERSION 0.1.2

RUN set -x; \
Expand Down
2 changes: 2 additions & 0 deletions mainline/debian-perl/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@
#
FROM nginx:1.29.4

LABEL org.opencontainers.image.source="https://github.com/nginx/nginx"

RUN set -x; \
NGINX_GPGKEY_PATH=/etc/apt/keyrings/nginx-archive-keyring.gpg; \
dpkgArch="$(dpkg --print-architecture)" \
Expand Down
1 change: 1 addition & 0 deletions mainline/debian/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
FROM debian:trixie-slim

LABEL maintainer="NGINX Docker Maintainers <[email protected]>"
LABEL org.opencontainers.image.source="https://github.com/nginx/nginx"

ENV NGINX_VERSION 1.29.4
ENV NJS_VERSION 0.9.4
Expand Down
1 change: 1 addition & 0 deletions modules/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@ RUN apt-get update \
&& echo "BUILT_MODULES=\"$BUILT_MODULES\"" > /tmp/packages/modules.env

FROM ${NGINX_FROM_IMAGE}
LABEL org.opencontainers.image.source="https://github.com/nginx/nginx"
RUN --mount=type=bind,target=/tmp/packages/,source=/tmp/packages/,from=builder \
apt-get update \
&& . /tmp/packages/modules.env \
Expand Down
1 change: 1 addition & 0 deletions modules/Dockerfile.alpine
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@ RUN apk update \
&& echo "BUILT_MODULES=\"$BUILT_MODULES\"" > /tmp/packages/modules.env

FROM ${NGINX_FROM_IMAGE}
LABEL org.opencontainers.image.source="https://github.com/nginx/nginx"
RUN --mount=type=bind,target=/tmp/packages/,source=/tmp/packages/,from=builder \
. /tmp/packages/modules.env \
&& for module in $BUILT_MODULES; do \
Expand Down
2 changes: 2 additions & 0 deletions stable/alpine-otel/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@
#
FROM nginx:1.28.0-alpine

LABEL org.opencontainers.image.source="https://github.com/nginx/nginx"

ENV OTEL_VERSION 0.1.2

RUN set -x \
Expand Down
2 changes: 2 additions & 0 deletions stable/alpine-perl/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@
#
FROM nginx:1.28.0-alpine

LABEL org.opencontainers.image.source="https://github.com/nginx/nginx"

RUN set -x \
&& apkArch="$(cat /etc/apk/arch)" \
&& nginxPackages=" \
Expand Down
1 change: 1 addition & 0 deletions stable/alpine-slim/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
FROM alpine:3.21

LABEL maintainer="NGINX Docker Maintainers <[email protected]>"
LABEL org.opencontainers.image.source="https://github.com/nginx/nginx"

ENV NGINX_VERSION 1.28.0
ENV PKG_RELEASE 1
Expand Down
2 changes: 2 additions & 0 deletions stable/alpine/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@
#
FROM nginx:1.28.0-alpine-slim

LABEL org.opencontainers.image.source="https://github.com/nginx/nginx"

ENV NJS_VERSION 0.8.10
ENV NJS_RELEASE 1

Expand Down
2 changes: 2 additions & 0 deletions stable/debian-otel/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@
#
FROM nginx:1.28.0

LABEL org.opencontainers.image.source="https://github.com/nginx/nginx"

ENV OTEL_VERSION 0.1.2

RUN set -x; \
Expand Down
2 changes: 2 additions & 0 deletions stable/debian-perl/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@
#
FROM nginx:1.28.0

LABEL org.opencontainers.image.source="https://github.com/nginx/nginx"

RUN set -x; \
NGINX_GPGKEY_PATH=/etc/apt/keyrings/nginx-archive-keyring.gpg; \
dpkgArch="$(dpkg --print-architecture)" \
Expand Down
1 change: 1 addition & 0 deletions stable/debian/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
FROM debian:bookworm-slim

LABEL maintainer="NGINX Docker Maintainers <[email protected]>"
LABEL org.opencontainers.image.source="https://github.com/nginx/nginx"

ENV NGINX_VERSION 1.28.0
ENV NJS_VERSION 0.8.10
Expand Down