From bcc492843585970680be5f67f0724ad6b1e10aa8 Mon Sep 17 00:00:00 2001
From: "blake.burkhart" <blake.burkhart@us.af.mil>
Date: Fri, 16 Apr 2021 17:01:46 +0000
Subject: [PATCH 1/2] Update Dockerfile

---
 Dockerfile | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 925ba76..0920180 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -4,7 +4,10 @@ ARG BASE_REGISTRY=nexus-docker-secure.levelup-dev.io
 ARG BASE_IMAGE=redhat/ubi/ubi8
 ARG BASE_TAG=8.2
 
-FROM istio/proxyv2:1.5.10 AS base
+# Updated by Renovate
+ARG version=1.5.10
+
+FROM istio/proxyv2:${version} AS base
 
 FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG}
 
@@ -23,8 +26,9 @@ ARG proxy_version
 ARG istio_version
 
 COPY --from=base /usr/local/bin/envoy /usr/local/bin/envoy
-ENV ISTIO_META_ISTIO_PROXY_SHA=istio-proxy:9b4239dee83dd8894bfc579d412ccd894cff2597
-ENV ISTIO_META_ISTIO_VERSION=1.5.4
+# Iron Bank cannot provide a meaningful SHA here, set it to a placeholder value
+ENV ISTIO_META_ISTIO_PROXY_SHA=isto-proxy:ironbank
+ENV ISTIO_META_ISTIO_VERSION=${version}
 COPY --from=base /usr/local/bin/pilot-agent /usr/local/bin/pilot-agent
 
 COPY --from=base /etc/istio/proxy/envoy_policy.yaml.tmpl /etc/istio/proxy/envoy_policy.yaml.tmpl
-- 
GitLab


From 010110b0371cea1c4213f300ad602c39dcc9c7c0 Mon Sep 17 00:00:00 2001
From: Tim Seagren <tim.seagren.ctr@us.af.mil>
Date: Fri, 16 Apr 2021 17:04:50 -0700
Subject: [PATCH 2/2] fixing string

---
 Dockerfile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 0920180..49ddd0c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -5,7 +5,7 @@ ARG BASE_IMAGE=redhat/ubi/ubi8
 ARG BASE_TAG=8.2
 
 # Updated by Renovate
-ARG version=1.5.10
+ARG version="1.5.10"
 
 FROM istio/proxyv2:${version} AS base
 
@@ -44,7 +44,7 @@ RUN useradd -u 1337 istio-proxy && \
     chown -R 1337 /etc/istio && \
     dnf update -y && \
     dnf clean all && \
-    rm -rf /var/cache/dnf/ 
+    rm -rf /var/cache/dnf/
 
 EXPOSE 443
 USER istio-proxy
-- 
GitLab