More Dockerfile cleanups.

Author: dkorunic

3.0/Dockerfile.api

@@ -67,8 +67,7 @@ COPY --from=awslc-builder /opt/aws-lc /opt/aws-lc
 COPY --from=hapce-builder /usr/local/sbin/haproxy /usr/local/sbin/haproxy
 COPY --from=hapce-builder /tmp/haproxy/examples/errorfiles/ /usr/local/etc/haproxy/errors
 
-ARG S6_OVERLAY_VERSION 3.2.1.0
-ENV S6_OVERLAY_VERSION $S6_OVERLAY_VERSION
+ENV S6_OVERLAY_VERSION 3.2.1.0
 ENV S6_READ_ONLY_ROOT 1
 ENV S6_USER haproxy
 ENV S6_GROUP haproxy

3.1/Dockerfile.api

@@ -67,8 +67,7 @@ COPY --from=awslc-builder /opt/aws-lc /opt/aws-lc
 COPY --from=hapce-builder /usr/local/sbin/haproxy /usr/local/sbin/haproxy
 COPY --from=hapce-builder /tmp/haproxy/examples/errorfiles/ /usr/local/etc/haproxy/errors
 
-ARG S6_OVERLAY_VERSION 3.2.1.0
-ENV S6_OVERLAY_VERSION $S6_OVERLAY_VERSION
+ENV S6_OVERLAY_VERSION 3.2.1.0
 ENV S6_READ_ONLY_ROOT 1
 ENV S6_USER haproxy
 ENV S6_GROUP haproxy

3.2/Dockerfile.api

@@ -67,8 +67,7 @@ COPY --from=awslc-builder /opt/aws-lc /opt/aws-lc
 COPY --from=hapce-builder /usr/local/sbin/haproxy /usr/local/sbin/haproxy
 COPY --from=hapce-builder /tmp/haproxy/examples/errorfiles/ /usr/local/etc/haproxy/errors
 
-ARG S6_OVERLAY_VERSION 3.2.1.0
-ENV S6_OVERLAY_VERSION $S6_OVERLAY_VERSION
+ENV S6_OVERLAY_VERSION 3.2.1.0
 ENV S6_READ_ONLY_ROOT 1
 ENV S6_USER haproxy
 ENV S6_GROUP haproxy

3.3/Dockerfile.api

@@ -67,8 +67,7 @@ COPY --from=awslc-builder /opt/aws-lc /opt/aws-lc
 COPY --from=hapce-builder /usr/local/sbin/haproxy /usr/local/sbin/haproxy
 COPY --from=hapce-builder /tmp/haproxy/examples/errorfiles/ /usr/local/etc/haproxy/errors
 
-ARG S6_OVERLAY_VERSION 3.2.1.0
-ENV S6_OVERLAY_VERSION $S6_OVERLAY_VERSION
+ENV S6_OVERLAY_VERSION 3.2.1.0
 ENV S6_READ_ONLY_ROOT 1
 ENV S6_USER haproxy
 ENV S6_GROUP haproxy

3.4/Dockerfile.api

@@ -67,8 +67,7 @@ COPY --from=awslc-builder /opt/aws-lc /opt/aws-lc
 COPY --from=hapce-builder /usr/local/sbin/haproxy /usr/local/sbin/haproxy
 COPY --from=hapce-builder /tmp/haproxy/examples/errorfiles/ /usr/local/etc/haproxy/errors
 
-ARG S6_OVERLAY_VERSION 3.2.1.0
-ENV S6_OVERLAY_VERSION $S6_OVERLAY_VERSION
+ENV S6_OVERLAY_VERSION 3.2.1.0
 ENV S6_READ_ONLY_ROOT 1
 ENV S6_USER haproxy
 ENV S6_GROUP haproxy