Skip to content

Commit

Permalink
feat: Update ENV instructions to use "="
Browse files Browse the repository at this point in the history
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
  • Loading branch information
alessfg committed Jul 8, 2024
1 parent a6f7d14 commit 1184eab
Show file tree
Hide file tree
Showing 15 changed files with 30 additions and 30 deletions.
2 changes: 1 addition & 1 deletion Dockerfile-alpine-otel.template
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM nginx:%%NGINX_VERSION%%-alpine

ENV OTEL_VERSION %%OTEL_VERSION%%
ENV OTEL_VERSION=%%OTEL_VERSION%%

RUN set -x \
&& apkArch="$(cat /etc/apk/arch)" \
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile-alpine-slim.template
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ FROM alpine:%%ALPINE_VERSION%%

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

ENV NGINX_VERSION %%NGINX_VERSION%%
ENV PKG_RELEASE %%PKG_RELEASE%%
ENV NGINX_VERSION=%%NGINX_VERSION%%
ENV PKG_RELEASE=%%PKG_RELEASE%%

RUN set -x \
# create nginx user/group first, to be consistent throughout docker variants
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile-alpine.template
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
FROM nginx:%%NGINX_VERSION%%-alpine-slim

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

RUN set -x \
&& apkArch="$(cat /etc/apk/arch)" \
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile-debian-otel.template
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM nginx:%%NGINX_VERSION%%

ENV OTEL_VERSION %%OTEL_VERSION%%
ENV OTEL_VERSION=%%OTEL_VERSION%%

RUN set -x; \
NGINX_GPGKEY_PATH=/etc/apt/keyrings/nginx-archive-keyring.gpg; \
Expand Down
8 changes: 4 additions & 4 deletions Dockerfile-debian.template
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@ FROM debian:%%DEBIAN_VERSION%%-slim

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

ENV NGINX_VERSION %%NGINX_VERSION%%
ENV NJS_VERSION %%NJS_VERSION%%
ENV NJS_RELEASE %%NJS_RELEASE%%
ENV PKG_RELEASE %%PKG_RELEASE%%
ENV NGINX_VERSION=%%NGINX_VERSION%%
ENV NJS_VERSION=%%NJS_VERSION%%
ENV NJS_RELEASE=%%NJS_RELEASE%%
ENV PKG_RELEASE=%%PKG_RELEASE%%

RUN set -x \
# create nginx user/group first, to be consistent throughout docker variants
Expand Down
2 changes: 1 addition & 1 deletion mainline/alpine-otel/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
#
FROM nginx:1.27.0-alpine

ENV OTEL_VERSION 0.1.0
ENV OTEL_VERSION=0.1.0

RUN set -x \
&& apkArch="$(cat /etc/apk/arch)" \
Expand Down
4 changes: 2 additions & 2 deletions mainline/alpine-slim/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ FROM alpine:3.19

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

ENV NGINX_VERSION 1.27.0
ENV PKG_RELEASE 2
ENV NGINX_VERSION=1.27.0
ENV PKG_RELEASE=2

RUN set -x \
# create nginx user/group first, to be consistent throughout docker variants
Expand Down
4 changes: 2 additions & 2 deletions mainline/alpine/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
#
FROM nginx:1.27.0-alpine-slim

ENV NJS_VERSION 0.8.4
ENV NJS_RELEASE 2
ENV NJS_VERSION=0.8.4
ENV NJS_RELEASE=2

RUN set -x \
&& apkArch="$(cat /etc/apk/arch)" \
Expand Down
2 changes: 1 addition & 1 deletion mainline/debian-otel/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
#
FROM nginx:1.27.0

ENV OTEL_VERSION 0.1.0
ENV OTEL_VERSION=0.1.0

RUN set -x; \
NGINX_GPGKEY_PATH=/etc/apt/keyrings/nginx-archive-keyring.gpg; \
Expand Down
8 changes: 4 additions & 4 deletions mainline/debian/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ FROM debian:bookworm-slim

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

ENV NGINX_VERSION 1.27.0
ENV NJS_VERSION 0.8.4
ENV NJS_RELEASE 2~bookworm
ENV PKG_RELEASE 2~bookworm
ENV NGINX_VERSION=1.27.0
ENV NJS_VERSION=0.8.4
ENV NJS_RELEASE=2~bookworm
ENV PKG_RELEASE=2~bookworm

RUN set -x \
# create nginx user/group first, to be consistent throughout docker variants
Expand Down
2 changes: 1 addition & 1 deletion stable/alpine-otel/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
#
FROM nginx:1.26.1-alpine

ENV OTEL_VERSION 0.1.0
ENV OTEL_VERSION=0.1.0

RUN set -x \
&& apkArch="$(cat /etc/apk/arch)" \
Expand Down
4 changes: 2 additions & 2 deletions stable/alpine-slim/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ FROM alpine:3.19

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

ENV NGINX_VERSION 1.26.1
ENV PKG_RELEASE 2
ENV NGINX_VERSION=1.26.1
ENV PKG_RELEASE=2

RUN set -x \
# create nginx user/group first, to be consistent throughout docker variants
Expand Down
4 changes: 2 additions & 2 deletions stable/alpine/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
#
FROM nginx:1.26.1-alpine-slim

ENV NJS_VERSION 0.8.4
ENV NJS_RELEASE 2
ENV NJS_VERSION=0.8.4
ENV NJS_RELEASE=2

RUN set -x \
&& apkArch="$(cat /etc/apk/arch)" \
Expand Down
2 changes: 1 addition & 1 deletion stable/debian-otel/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
#
FROM nginx:1.26.1

ENV OTEL_VERSION 0.1.0
ENV OTEL_VERSION=0.1.0

RUN set -x; \
NGINX_GPGKEY_PATH=/etc/apt/keyrings/nginx-archive-keyring.gpg; \
Expand Down
8 changes: 4 additions & 4 deletions stable/debian/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ FROM debian:bookworm-slim

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

ENV NGINX_VERSION 1.26.1
ENV NJS_VERSION 0.8.4
ENV NJS_RELEASE 2~bookworm
ENV PKG_RELEASE 2~bookworm
ENV NGINX_VERSION=1.26.1
ENV NJS_VERSION=0.8.4
ENV NJS_RELEASE=2~bookworm
ENV PKG_RELEASE=2~bookworm

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

0 comments on commit 1184eab

Please sign in to comment.