Update Docker files due to hadolint (hyperledger#1954)

Hadolint introduced a new linting rule prohibiting using the same env var in it's definition. Move to a two step definition. Signed-off-by: Danno Ferrin <danno.ferrin@gmail.com>
atoulme · Feb 25, 2021 · 73a2b72 · 73a2b72
1 parent 58bc4e8
commit 73a2b72
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/docker/graalvm/Dockerfile b/docker/graalvm/Dockerfile
@@ -25,7 +25,9 @@ ENV BESU_PID_PATH "/tmp/pid"
 
 ENV OTEL_RESOURCE_ATTRIBUTES="service.name=besu,service.version=$VERSION"
 
-ENV PATH="/opt/besu/bin:${PATH}"
+ENV OLDPATH="${PATH}"
+ENV PATH="/opt/besu/bin:${OLDPATH}"
+
 ENTRYPOINT ["besu"]
 HEALTHCHECK --start-period=5s --interval=5s --timeout=1s --retries=10 CMD bash -c "[ -f /tmp/pid ]"
 

diff --git a/docker/openjdk-11/Dockerfile b/docker/openjdk-11/Dockerfile
@@ -25,7 +25,9 @@ ENV BESU_PID_PATH "/tmp/pid"
 
 ENV OTEL_RESOURCE_ATTRIBUTES="service.name=besu,service.version=$VERSION"
 
-ENV PATH="/opt/besu/bin:${PATH}"
+ENV OLDPATH="${PATH}"
+ENV PATH="/opt/besu/bin:${OLDPATH}"
+
 ENTRYPOINT ["besu"]
 HEALTHCHECK --start-period=5s --interval=5s --timeout=1s --retries=10 CMD bash -c "[ -f /tmp/pid ]"
 

diff --git a/docker/openjdk-latest/Dockerfile b/docker/openjdk-latest/Dockerfile
@@ -25,7 +25,9 @@ ENV BESU_PID_PATH "/tmp/pid"
 
 ENV OTEL_RESOURCE_ATTRIBUTES="service.name=besu,service.version=$VERSION"
 
-ENV PATH="/opt/besu/bin:${PATH}"
+ENV OLDPATH="${PATH}"
+ENV PATH="/opt/besu/bin:${OLDPATH}"
+
 ENTRYPOINT ["besu"]
 HEALTHCHECK --start-period=5s --interval=5s --timeout=1s --retries=10 CMD bash -c "[ -f /tmp/pid ]"