From 1a78d19f9982fe9ed0af044ea9d9c784cbab5e36 Mon Sep 17 00:00:00 2001
From: shen_vickie <shen_vickie@bah.com>
Date: Fri, 28 May 2021 11:50:08 -0400
Subject: [PATCH 1/2] Tag to 0.29.2

---
 Dockerfile              | 6 +++---
 hardening_manifest.yaml | 8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index d159db0..5e2ca8e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@ ARG BASE_REGISTRY=registry1.dso.mil
 ARG BASE_IMAGE=ironbank/redhat/ubi/ubi8
 ARG BASE_TAG=8.4
 
-FROM openpolicyagent/opa:0.28.0 as base
+FROM openpolicyagent/opa:0.29.1 as base
 
 FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG}
 
@@ -13,11 +13,11 @@ RUN dnf upgrade -y && \
 
 COPY --from=base /opa /opa
 
+USER 1001
+
 HEALTHCHECK --interval=5s --timeout=5s --start-period=5s --retries=3 \
   CMD curl -f http://locahost:8181/health || exit 1
 
-USER 1001
-
 ENTRYPOINT ["/opa"]
 
 CMD ["run"]
diff --git a/hardening_manifest.yaml b/hardening_manifest.yaml
index 1c8cfcf..f891168 100644
--- a/hardening_manifest.yaml
+++ b/hardening_manifest.yaml
@@ -8,7 +8,7 @@ name: "opensource/openpolicyagent/opa"
 # The most specific version should be the first tag and will be shown
 # on ironbank.dsop.io
 tags:
-- "0.28.0"
+- "0.29.2"
 - "latest"
 
 # Build args passed to Dockerfile ARGs
@@ -27,7 +27,7 @@ labels:
   org.opencontainers.image.url: "https://www.openpolicyagent.org/"
   # Name of the distributing entity, organization or individual
   org.opencontainers.image.vendor: "styra"
-  org.opencontainers.image.version: "0.28.0"
+  org.opencontainers.image.version: "0.29.2"
   # Keywords to help with search (ex. "cicd,gitops,golang")
   mil.dso.ironbank.image.keywords: "policy,control,cloud,administration"
   # This value can be "opensource" or "commercial"
@@ -37,8 +37,8 @@ labels:
 
 # List of resources to make available to the offline build context
 resources:
-- tag: openpolicyagent/opa:0.28.0
-  url: docker://docker.io/openpolicyagent/opa@sha256:c5f5928527e26f35ee483bdfc5d439c58465bd511e36bc5ecc1da19b61c43248
+- tag: openpolicyagent/opa:0.29.2
+  url: docker://docker.io/openpolicyagent/opa@sha256:61d9bb9050b89b01e1c04be061a4b8d6b1432512f0dbc38d48b83eec07870061
 
 # List of project maintainers
 maintainers:
-- 
GitLab


From 6272213f1e105e39a2606dabe218403f5fc647cc Mon Sep 17 00:00:00 2001
From: Karl Breidenbach <karlbreidenbach@seed-innovations.com>
Date: Mon, 31 May 2021 22:01:25 +0000
Subject: [PATCH 2/2] Update Dockerfile to 29.2 from 29.1.

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 5e2ca8e..a556451 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@ ARG BASE_REGISTRY=registry1.dso.mil
 ARG BASE_IMAGE=ironbank/redhat/ubi/ubi8
 ARG BASE_TAG=8.4
 
-FROM openpolicyagent/opa:0.29.1 as base
+FROM openpolicyagent/opa:0.29.2 as base
 
 FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG}
 
-- 
GitLab