Fixed formatting and Dockerfile to pull ENV vars again

build/Dockerfile

@@ -3,15 +3,16 @@ ARG UPSTREAM_VERSION
 FROM hyperledger/besu:${UPSTREAM_VERSION}
 
 USER root
+
 RUN mkdir /var/lib/besu
 
 COPY jwtsecret.hex /jwtsecret
 COPY entrypoint.sh /usr/bin/entrypoint.sh
 
 RUN chown -R besu:besu /var/lib/besu && chmod 777 /usr/bin/entrypoint.sh && chown -R besu:besu /jwtsecret && chmod 666 /jwtsecret
 
-ENV BESU_OPTS=$BESU_OPTS
-
 USER besu
 
+ENV BESU_OPTS=$BESU_OPTS
+
 ENTRYPOINT [ "entrypoint.sh" ]

build/entrypoint.sh

@@ -6,4 +6,21 @@ else
     echo "Using supplied jwtsecret!"
 fi
 
-exec besu --rpc-ws-host=0.0.0.0 --rpc-ws-enabled=$WS_ENABLED --rpc-http-host=0.0.0.0 --rpc-http-enabled=$RPC_ENABLED --host-allowlist="*" --rpc-http-cors-origins="*" --engine-rpc-port=8551 --engine-host-allowlist="*" --engine-jwt-secret="/jwtsecret" --engine-rpc-enabled=$ENGINE_API_ENABLED --data-storage-format=$STORAGE_FORMAT --metrics-enabled --metrics-host=0.0.0.0 --data-path="/var/lib/besu" --sync-mode=$SYNC_MODE --rpc-http-max-active-connections=$MAX_HTTP_CONNECTIONS --p2p-port=$P2P_PORT $EXTRA_OPTS
+exec besu --rpc-ws-host=0.0.0.0 \
+          --rpc-ws-enabled=$WS_ENABLED \
+          --rpc-http-host=0.0.0.0 \
+          --rpc-http-enabled=$RPC_ENABLED \
+          --host-allowlist="*" \
+          --rpc-http-cors-origins="*" \
+          --engine-rpc-port=8551 \
+          --engine-host-allowlist="*" \
+          --engine-jwt-secret=/jwtsecret \
+          --engine-rpc-enabled=$ENGINE_API_ENABLED \
+          --data-storage-format=$STORAGE_FORMAT 
+          --metrics-enabled \
+          --metrics-host=0.0.0.0 \
+          --data-path="/var/lib/besu" \
+          --sync-mode=$SYNC_MODE \
+          --rpc-http-max-active-connections=$MAX_HTTP_CONNECTIONS \
+          --p2p-port=$P2P_PORT \
+          $EXTRA_OPTS