Merge dev to master

Dockerfile

@@ -9,14 +9,6 @@ FROM opensource/istio/pilot/pilot:1.5.4 AS base
 
 FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG}
 
-COPY --from=base /usr/local/bin/ /usr/local/bin/
-COPY --from=base /cacert.pem /cacert.pem
-
-RUN dnf update -y && \
-    dnf clean all && \
-    rm -rf /var/cache/dnf/
-###############################################################
-# Provide label information
 LABEL name="istio-pilot" \
       maintainer="gavin.scallon@parsons.com" \
       vendor="Open Source" \
@@ -24,8 +16,15 @@ LABEL name="istio-pilot" \
       release="1" \
       summary="Istio Pilot provides traffic management capabilities in the Istio Service mesh" \
       description="provides service discovery for the Envoy sidecars, traffic management capabilities for intelligent routing, and resiliency."
-###############################################################
-# Run as non-root user
+
+COPY --from=base /usr/local/bin/ /usr/local/bin/
+COPY --from=base /cacert.pem /cacert.pem
+
+RUN dnf update -y && \
+    dnf clean all && \
+    rm -rf /var/cache/dnf/
+
+EXPOSE 80 443
 USER 1001
 ###############################################################
 ENTRYPOINT [ "/usr/local/bin/pilot-discovery" ]