Skip to content

Commit 9feec55

Browse files
committed
refactor: Move OTEL_VERSION environment variable directly after the FROM instruction
1 parent 4eb1ce4 commit 9feec55

File tree

6 files changed

+12
-12
lines changed

6 files changed

+12
-12
lines changed

Dockerfile-alpine-otel.template

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
ARG IMAGE=nginxinc/nginx-unprivileged:%%NGINX_VERSION%%-alpine
22
FROM $IMAGE
33

4+
ENV OTEL_VERSION=%%OTEL_VERSION%%
5+
46
ARG UID=101
57
ARG GID=101
68

79
USER root
810

9-
ENV OTEL_VERSION=%%OTEL_VERSION%%
10-
1111
RUN set -x \
1212
&& apkArch="$(cat /etc/apk/arch)" \
1313
&& nginxPackages="%%PACKAGES%%

Dockerfile-debian-otel.template

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
ARG IMAGE=nginxinc/nginx-unprivileged:%%NGINX_VERSION%%
22
FROM $IMAGE
33

4+
ENV OTEL_VERSION=%%OTEL_VERSION%%
5+
46
ARG UID=101
57
ARG GID=101
68

79
USER root
810

9-
ENV OTEL_VERSION=%%OTEL_VERSION%%
10-
1111
RUN set -x; \
1212
NGINX_GPGKEY_PATH=/etc/apt/keyrings/nginx-archive-keyring.gpg; \
1313
dpkgArch="$(dpkg --print-architecture)" \

mainline/alpine-otel/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@
66
ARG IMAGE=nginxinc/nginx-unprivileged:1.27.5-alpine
77
FROM $IMAGE
88

9+
ENV OTEL_VERSION=0.1.2
10+
911
ARG UID=101
1012
ARG GID=101
1113

1214
USER root
1315

14-
ENV OTEL_VERSION=0.1.2
15-
1616
RUN set -x \
1717
&& apkArch="$(cat /etc/apk/arch)" \
1818
&& nginxPackages=" \

mainline/debian-otel/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@
66
ARG IMAGE=nginxinc/nginx-unprivileged:1.27.5
77
FROM $IMAGE
88

9+
ENV OTEL_VERSION=0.1.2
10+
911
ARG UID=101
1012
ARG GID=101
1113

1214
USER root
1315

14-
ENV OTEL_VERSION=0.1.2
15-
1616
RUN set -x; \
1717
NGINX_GPGKEY_PATH=/etc/apt/keyrings/nginx-archive-keyring.gpg; \
1818
dpkgArch="$(dpkg --print-architecture)" \

stable/alpine-otel/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@
66
ARG IMAGE=nginxinc/nginx-unprivileged:1.28.0-alpine
77
FROM $IMAGE
88

9+
ENV OTEL_VERSION=0.1.2
10+
911
ARG UID=101
1012
ARG GID=101
1113

1214
USER root
1315

14-
ENV OTEL_VERSION=0.1.2
15-
1616
RUN set -x \
1717
&& apkArch="$(cat /etc/apk/arch)" \
1818
&& nginxPackages=" \

stable/debian-otel/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@
66
ARG IMAGE=nginxinc/nginx-unprivileged:1.28.0
77
FROM $IMAGE
88

9+
ENV OTEL_VERSION=0.1.2
10+
911
ARG UID=101
1012
ARG GID=101
1113

1214
USER root
1315

14-
ENV OTEL_VERSION=0.1.2
15-
1616
RUN set -x; \
1717
NGINX_GPGKEY_PATH=/etc/apt/keyrings/nginx-archive-keyring.gpg; \
1818
dpkgArch="$(dpkg --print-architecture)" \

0 commit comments

Comments
 (0)