From 99cbac71abedab393c4131fc4d0ff111654d0d20 Mon Sep 17 00:00:00 2001
From: jweatherford <jweatherford@oteemo.com>
Date: Tue, 15 Dec 2020 11:09:55 -0500
Subject: [PATCH 1/2] hardening manifest migration

---
 Jenkinsfile             |  2 --
 download.yaml           |  8 -------
 hardening_manifest.yaml | 46 +++++++++++++++++++++++++++++++++++++++++
 3 files changed, 46 insertions(+), 10 deletions(-)
 delete mode 100644 Jenkinsfile
 delete mode 100644 download.yaml
 create mode 100644 hardening_manifest.yaml

diff --git a/Jenkinsfile b/Jenkinsfile
deleted file mode 100644
index 0143265..0000000
--- a/Jenkinsfile
+++ /dev/null
@@ -1,2 +0,0 @@
-@Library('DCCSCR@master') _
-dccscrPipeline(version: "898462ec4f1a")
diff --git a/download.yaml b/download.yaml
deleted file mode 100644
index d63f1f5..0000000
--- a/download.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-resources:
-  - url: "docker://gcr.io/kubeflow-images-public/katib/suggestion-random@sha256:898462ec4f1ad8a857a3c5d867788b2d042d7cebd8c2c2f040fab0966758b416"
-    tag: "kubeflow-images-public/katib/suggestion-random:latest"
-  - url: "https://musl.libc.org/releases/musl-1.2.0.tar.gz"
-    filename: musl-1.2.0.tar.gz
-    validation:
-      type: sha256
-      value: c6de7b191139142d3f9a7b5b702c9cae1b5ee6e7f57e582da9328629408fd4e8    
\ No newline at end of file
diff --git a/hardening_manifest.yaml b/hardening_manifest.yaml
new file mode 100644
index 0000000..1a71c63
--- /dev/null
+++ b/hardening_manifest.yaml
@@ -0,0 +1,46 @@
+---
+apiVersion: v1
+
+# The repository name in registry1, excluding /ironbank/
+name: "kubeflow/katib/suggestion-random-898462ec4f1a"
+
+# List of tags to push for the repository in registry1
+# The most specific version should be the first tag and will be shown
+# on ironbank.dsop.io
+tags:
+- "898462ec4f1a"
+- "latest"
+
+# Build args passed to Dockerfile ARGs
+args:
+  BASE_IMAGE: "redhat/ubi/ubi8"
+  BASE_TAG: "8.3"
+
+# Docker image labels
+labels:
+  org.opencontainers.image.title: "suggestion-random-898462ec4f1a"
+  org.opencontainers.image.description: "This is a hardened version of the upstream image. This is not mean for solo deployment."
+  org.opencontainers.image.licenses: "Apache-2.0"
+  org.opencontainers.image.url: "igcr.io/kubeflow-images-public/katib/suggestion-random@sha256:898462ec4f1ad8a857a3c5d867788b2d042d7cebd8c2c2f040fab0966758b416"
+  org.opencontainers.image.vendor: "Kubeflow"
+  org.opencontainers.image.version: "898462ec4f1a"
+  mil.dso.ironbank.image.keywords: "kubeflow,kubernetes,katib,random,suggestion"
+  mil.dso.ironbank.image.type: "opensource"
+  mil.dso.ironbank.product.name: "kubeflow"
+
+# List of resources to make available to the offline build context
+resources:
+  - url: "docker://gcr.io/kubeflow-images-public/katib/suggestion-random@sha256:898462ec4f1ad8a857a3c5d867788b2d042d7cebd8c2c2f040fab0966758b416"
+    tag: "kubeflow-images-public/katib/suggestion-random:latest"
+  - url: "https://musl.libc.org/releases/musl-1.2.0.tar.gz"
+    filename: musl-1.2.0.tar.gz
+    validation:
+      type: sha256
+      value: c6de7b191139142d3f9a7b5b702c9cae1b5ee6e7f57e582da9328629408fd4e8
+
+# List of project maintainers
+maintainers:
+- email: "cvernooy@oteemo.com"
+  name: "cvernooy"
+  username: "Chris Vernooy"
+  cht_member: true
-- 
GitLab


From ec353e536fe9f786d433636f18b202be307bde46 Mon Sep 17 00:00:00 2001
From: jweatherford <jweatherford@oteemo.com>
Date: Tue, 15 Dec 2020 11:27:29 -0500
Subject: [PATCH 2/2] hardening manifest migration

---
 Dockerfile | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index f8e5c9f..e78108c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -19,12 +19,6 @@ RUN ./configure && \
 FROM kubeflow-images-public/katib/suggestion-random:latest as base
 #FROM gcr.io/kubeflow-images-public/katib/suggestion-random@sha256:898462ec4f1ad8a857a3c5d867788b2d042d7cebd8c2c2f040fab0966758b416 as base
 FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG}
-LABEL org.opencontainers.image.title="Katib-suggestion-random" \
-      org.opencontainers.image.description="Suggestion Random Service Engine" \
-      org.opencontainers.image.licenses="Apache-2.0" \
-      org.opencontainers.image.url="gcr.io/kubeflow-images-public/katib/suggestion-random@sha256:898462ec4f1ad8a857a3c5d867788b2d042d7cebd8c2c2f040fab0966758b416" \
-      org.opencontainers.image.version="latest" \
-      maintainer="cvernooy@oteemo.com"
 RUN dnf upgrade -y && \
         dnf clean all && \
         rm -rf /var/cache/dnf
-- 
GitLab