From 0f2d0319db90b420ffa9f84d9b08885da38f8d7d Mon Sep 17 00:00:00 2001 From: ironbank-bot Date: Thu, 10 Dec 2020 01:17:18 +0000 Subject: [PATCH 1/2] Migrate to hardening_manifest.yaml --- Dockerfile | 7 ------ Jenkinsfile | 2 -- download.yaml | 4 --- hardening_manifest.yaml | 55 +++++++++++++++++++++++++++++++++++++++++ 4 files changed, 55 insertions(+), 13 deletions(-) delete mode 100644 Jenkinsfile delete mode 100644 download.yaml create mode 100644 hardening_manifest.yaml diff --git a/Dockerfile b/Dockerfile index 146a5e2..106d570 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,13 +7,6 @@ ARG BASE_TAG=8.2 FROM opensource/minio/mcs:v0.1.0 AS base FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG} ############################################################### -LABEL name="MinIO Console Server" \ - maintainer="gavin.scallon@parsons.com" \ - vendor="Open Source - MinIO" \ - version="v0.1.0" \ - release="1" \ - summary="A graphical user interface for MinIO." \ - description="mcs can be used in conjunction with the MinIO operator and MinIO server to describe MinIO information." COPY --from=base /mcs / EXPOSE 9090 diff --git a/Jenkinsfile b/Jenkinsfile deleted file mode 100644 index e214e3c..0000000 --- a/Jenkinsfile +++ /dev/null @@ -1,2 +0,0 @@ -@Library('DCCSCR@master') _ -dccscrPipeline( version: "v0.1.0") \ No newline at end of file diff --git a/download.yaml b/download.yaml deleted file mode 100644 index e0b2a73..0000000 --- a/download.yaml +++ /dev/null @@ -1,4 +0,0 @@ ---- -resources: - - url: docker://docker.io/minio/mcs@sha256:6df3e3ce7aebca2624c514593a053915de59808c4dee0c2cc430c289c9cdf4d7 - tag: opensource/minio/mcs:v0.1.0 diff --git a/hardening_manifest.yaml b/hardening_manifest.yaml new file mode 100644 index 0000000..1162f30 --- /dev/null +++ b/hardening_manifest.yaml @@ -0,0 +1,55 @@ +--- +apiVersion: v1 + +# The repository name in registry1, excluding /ironbank/ +name: "opensource/minio/mcs" + +# 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: +- "v0.1.0" +- "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: "mcs" + ## Human-readable description of the software packaged in the image + # org.opencontainers.image.description: "FIXME" + ## License(s) under which contained software is distributed + # org.opencontainers.image.licenses: "FIXME" + ## URL to find more information on the image + # org.opencontainers.image.url: "FIXME" + ## Name of the distributing entity, organization or individual + # org.opencontainers.image.vendor: "FIXME" + org.opencontainers.image.version: "v0.1.0" + ## Keywords to help with search (ex. "cicd,gitops,golang") + # mil.dso.ironbank.image.keywords: "FIXME" + ## This value can be "opensource" or "commercial" + # mil.dso.ironbank.image.type: "FIXME" + ## Product the image belongs to for grouping multiple images + # mil.dso.ironbank.product.name: "FIXME" + +# List of resources to make available to the offline build context +resources: +- tag: opensource/minio/mcs:v0.1.0 + url: docker://docker.io/minio/mcs@sha256:6df3e3ce7aebca2624c514593a053915de59808c4dee0c2cc430c289c9cdf4d7 + +# List of project maintainers +# FIXME: Fill in the following details for the current container owner in the whitelist +# FIXME: Include any other vendor information if applicable +maintainers: +- email: "gavin.scallon@parsons.com" +# # The name of the current container owner +# name: "FIXME" +# # The gitlab username of the current container owner +# username: "FIXME" +# cht_member: true # FIXME: Uncomment if the maintainer is a member of CHT +# - name: "FIXME" +# username: "FIXME" +# email: "FIXME" -- GitLab From 395c3f362d13079798db8f3668bacfc50cb8daad Mon Sep 17 00:00:00 2001 From: Olga O Date: Mon, 28 Dec 2020 13:03:23 -0600 Subject: [PATCH 2/2] changed hardening_manifest, adjusted dockerfile --- Dockerfile | 6 +++--- hardening_manifest.yaml | 20 ++++++++++---------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/Dockerfile b/Dockerfile index 106d570..401f5cc 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,8 +1,8 @@ ############################################################### # Default registry variables -ARG BASE_REGISTRY=nexus-docker-secure.levelup-dev.io -ARG BASE_IMAGE=redhat/ubi/ubi8 -ARG BASE_TAG=8.2 +ARG BASE_REGISTRY=registry1.dso.mil +ARG BASE_IMAGE=ironbank/redhat/ubi/ubi8 +ARG BASE_TAG=latest FROM opensource/minio/mcs:v0.1.0 AS base FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG} diff --git a/hardening_manifest.yaml b/hardening_manifest.yaml index 1162f30..e70399e 100644 --- a/hardening_manifest.yaml +++ b/hardening_manifest.yaml @@ -20,20 +20,20 @@ args: labels: org.opencontainers.image.title: "mcs" ## Human-readable description of the software packaged in the image - # org.opencontainers.image.description: "FIXME" + org.opencontainers.image.description: "MinIO is an object storage server comptatible with Amazon S3 APIs. mcs is a graphical user interface which can be used to display the MinIO information from the server." ## License(s) under which contained software is distributed - # org.opencontainers.image.licenses: "FIXME" + org.opencontainers.image.licenses: "GNU AFFERO GENERAL PUBLIC LICENSE" ## URL to find more information on the image - # org.opencontainers.image.url: "FIXME" + org.opencontainers.image.url: "https://github.com/minio/mcs" ## Name of the distributing entity, organization or individual - # org.opencontainers.image.vendor: "FIXME" + org.opencontainers.image.vendor: "opensource" org.opencontainers.image.version: "v0.1.0" ## Keywords to help with search (ex. "cicd,gitops,golang") - # mil.dso.ironbank.image.keywords: "FIXME" + mil.dso.ironbank.image.keywords: "mcs,minio,storage" ## This value can be "opensource" or "commercial" - # mil.dso.ironbank.image.type: "FIXME" + mil.dso.ironbank.image.type: "opensource" ## Product the image belongs to for grouping multiple images - # mil.dso.ironbank.product.name: "FIXME" + mil.dso.ironbank.product.name: "mcs" # List of resources to make available to the offline build context resources: @@ -46,10 +46,10 @@ resources: maintainers: - email: "gavin.scallon@parsons.com" # # The name of the current container owner -# name: "FIXME" + name: "Gavin Scallon" # # The gitlab username of the current container owner -# username: "FIXME" -# cht_member: true # FIXME: Uncomment if the maintainer is a member of CHT + username: "gavin.scallon" + cht_member: true # FIXME: Uncomment if the maintainer is a member of CHT # - name: "FIXME" # username: "FIXME" # email: "FIXME" -- GitLab