Skip to content

Commit 6dc0200

Browse files
committed
feat: Update ENV instructions to use "="
Update the various Dockerfile ENV instructions to use the new format (using `=` as the key value separator instead of a whitespace) per the latest docs https://docs.docker.com/reference/dockerfile/#env
1 parent a6f7d14 commit 6dc0200

15 files changed

+30
-30
lines changed

Dockerfile-alpine-otel.template

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
FROM nginx:%%NGINX_VERSION%%-alpine
22

3-
ENV OTEL_VERSION %%OTEL_VERSION%%
3+
ENV OTEL_VERSION=%%OTEL_VERSION%%
44

55
RUN set -x \
66
&& apkArch="$(cat /etc/apk/arch)" \

Dockerfile-alpine-slim.template

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ FROM alpine:%%ALPINE_VERSION%%
22

33
LABEL maintainer="NGINX Docker Maintainers <[email protected]>"
44

5-
ENV NGINX_VERSION %%NGINX_VERSION%%
6-
ENV PKG_RELEASE %%PKG_RELEASE%%
5+
ENV NGINX_VERSION=%%NGINX_VERSION%%
6+
ENV PKG_RELEASE=%%PKG_RELEASE%%
77

88
RUN set -x \
99
# create nginx user/group first, to be consistent throughout docker variants

Dockerfile-alpine.template

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
FROM nginx:%%NGINX_VERSION%%-alpine-slim
22

3-
ENV NJS_VERSION %%NJS_VERSION%%
4-
ENV NJS_RELEASE %%NJS_RELEASE%%
3+
ENV NJS_VERSION=%%NJS_VERSION%%
4+
ENV NJS_RELEASE=%%NJS_RELEASE%%
55

66
RUN set -x \
77
&& apkArch="$(cat /etc/apk/arch)" \

Dockerfile-debian-otel.template

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
FROM nginx:%%NGINX_VERSION%%
22

3-
ENV OTEL_VERSION %%OTEL_VERSION%%
3+
ENV OTEL_VERSION=%%OTEL_VERSION%%
44

55
RUN set -x; \
66
NGINX_GPGKEY_PATH=/etc/apt/keyrings/nginx-archive-keyring.gpg; \

Dockerfile-debian.template

+4-4
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@ FROM debian:%%DEBIAN_VERSION%%-slim
22

33
LABEL maintainer="NGINX Docker Maintainers <[email protected]>"
44

5-
ENV NGINX_VERSION %%NGINX_VERSION%%
6-
ENV NJS_VERSION %%NJS_VERSION%%
7-
ENV NJS_RELEASE %%NJS_RELEASE%%
8-
ENV PKG_RELEASE %%PKG_RELEASE%%
5+
ENV NGINX_VERSION=%%NGINX_VERSION%%
6+
ENV NJS_VERSION=%%NJS_VERSION%%
7+
ENV NJS_RELEASE=%%NJS_RELEASE%%
8+
ENV PKG_RELEASE=%%PKG_RELEASE%%
99

1010
RUN set -x \
1111
# create nginx user/group first, to be consistent throughout docker variants

mainline/alpine-otel/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
#
66
FROM nginx:1.27.0-alpine
77

8-
ENV OTEL_VERSION 0.1.0
8+
ENV OTEL_VERSION=0.1.0
99

1010
RUN set -x \
1111
&& apkArch="$(cat /etc/apk/arch)" \

mainline/alpine-slim/Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ FROM alpine:3.19
77

88
LABEL maintainer="NGINX Docker Maintainers <[email protected]>"
99

10-
ENV NGINX_VERSION 1.27.0
11-
ENV PKG_RELEASE 2
10+
ENV NGINX_VERSION=1.27.0
11+
ENV PKG_RELEASE=2
1212

1313
RUN set -x \
1414
# create nginx user/group first, to be consistent throughout docker variants

mainline/alpine/Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
#
66
FROM nginx:1.27.0-alpine-slim
77

8-
ENV NJS_VERSION 0.8.4
9-
ENV NJS_RELEASE 2
8+
ENV NJS_VERSION=0.8.4
9+
ENV NJS_RELEASE=2
1010

1111
RUN set -x \
1212
&& apkArch="$(cat /etc/apk/arch)" \

mainline/debian-otel/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
#
66
FROM nginx:1.27.0
77

8-
ENV OTEL_VERSION 0.1.0
8+
ENV OTEL_VERSION=0.1.0
99

1010
RUN set -x; \
1111
NGINX_GPGKEY_PATH=/etc/apt/keyrings/nginx-archive-keyring.gpg; \

mainline/debian/Dockerfile

+4-4
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ FROM debian:bookworm-slim
77

88
LABEL maintainer="NGINX Docker Maintainers <[email protected]>"
99

10-
ENV NGINX_VERSION 1.27.0
11-
ENV NJS_VERSION 0.8.4
12-
ENV NJS_RELEASE 2~bookworm
13-
ENV PKG_RELEASE 2~bookworm
10+
ENV NGINX_VERSION=1.27.0
11+
ENV NJS_VERSION=0.8.4
12+
ENV NJS_RELEASE=2~bookworm
13+
ENV PKG_RELEASE=2~bookworm
1414

1515
RUN set -x \
1616
# create nginx user/group first, to be consistent throughout docker variants

stable/alpine-otel/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
#
66
FROM nginx:1.26.1-alpine
77

8-
ENV OTEL_VERSION 0.1.0
8+
ENV OTEL_VERSION=0.1.0
99

1010
RUN set -x \
1111
&& apkArch="$(cat /etc/apk/arch)" \

stable/alpine-slim/Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ FROM alpine:3.19
77

88
LABEL maintainer="NGINX Docker Maintainers <[email protected]>"
99

10-
ENV NGINX_VERSION 1.26.1
11-
ENV PKG_RELEASE 2
10+
ENV NGINX_VERSION=1.26.1
11+
ENV PKG_RELEASE=2
1212

1313
RUN set -x \
1414
# create nginx user/group first, to be consistent throughout docker variants

stable/alpine/Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
#
66
FROM nginx:1.26.1-alpine-slim
77

8-
ENV NJS_VERSION 0.8.4
9-
ENV NJS_RELEASE 2
8+
ENV NJS_VERSION=0.8.4
9+
ENV NJS_RELEASE=2
1010

1111
RUN set -x \
1212
&& apkArch="$(cat /etc/apk/arch)" \

stable/debian-otel/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
#
66
FROM nginx:1.26.1
77

8-
ENV OTEL_VERSION 0.1.0
8+
ENV OTEL_VERSION=0.1.0
99

1010
RUN set -x; \
1111
NGINX_GPGKEY_PATH=/etc/apt/keyrings/nginx-archive-keyring.gpg; \

stable/debian/Dockerfile

+4-4
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ FROM debian:bookworm-slim
77

88
LABEL maintainer="NGINX Docker Maintainers <[email protected]>"
99

10-
ENV NGINX_VERSION 1.26.1
11-
ENV NJS_VERSION 0.8.4
12-
ENV NJS_RELEASE 2~bookworm
13-
ENV PKG_RELEASE 2~bookworm
10+
ENV NGINX_VERSION=1.26.1
11+
ENV NJS_VERSION=0.8.4
12+
ENV NJS_RELEASE=2~bookworm
13+
ENV PKG_RELEASE=2~bookworm
1414

1515
RUN set -x \
1616
# create nginx user/group first, to be consistent throughout docker variants

0 commit comments

Comments
 (0)