UNCLASSIFIED

You need to sign in or sign up before continuing.
Commit 98c9b309 authored by thomas.shepherd's avatar thomas.shepherd
Browse files

Merge branch 'development' into 'master'

Merge Development into Master

See merge request !61
parents 6fba6d2e bfe89fe2
Pipeline #301198 passed with stages
in 10 minutes and 27 seconds
...@@ -2,7 +2,7 @@ ARG BASE_REGISTRY=registry1.dso.mil ...@@ -2,7 +2,7 @@ ARG BASE_REGISTRY=registry1.dso.mil
ARG BASE_IMAGE=ironbank/redhat/ubi/ubi8 ARG BASE_IMAGE=ironbank/redhat/ubi/ubi8
ARG BASE_TAG=latest ARG BASE_TAG=latest
FROM minio/mc:RELEASE.2021-05-18T03-39-44Z as base FROM minio/mc:RELEASE.2021-05-26T19-19-26Z as base
FROM $BASE_REGISTRY/$BASE_IMAGE:$BASE_TAG FROM $BASE_REGISTRY/$BASE_IMAGE:$BASE_TAG
......
...@@ -8,7 +8,7 @@ name: "opensource/minio/mc" ...@@ -8,7 +8,7 @@ name: "opensource/minio/mc"
# The most specific version should be the first tag and will be shown # The most specific version should be the first tag and will be shown
# on ironbank.dsop.io # on ironbank.dsop.io
tags: tags:
- "RELEASE.2021-05-18T03-39-44Z" - "RELEASE.2021-05-26T19-19-26Z"
- "latest" - "latest"
# Build args passed to Dockerfile ARGs # Build args passed to Dockerfile ARGs
...@@ -27,7 +27,7 @@ labels: ...@@ -27,7 +27,7 @@ labels:
org.opencontainers.image.url: "https://docs.min.io/docs/minio-client-complete-guide.html" org.opencontainers.image.url: "https://docs.min.io/docs/minio-client-complete-guide.html"
# Name of the distributing entity, organization or individual # Name of the distributing entity, organization or individual
org.opencontainers.image.vendor: "MinIO" org.opencontainers.image.vendor: "MinIO"
org.opencontainers.image.version: "RELEASE.2021-05-18T03-39-44Z" org.opencontainers.image.version: "RELEASE.2021-05-26T19-19-26Z"
# Keywords to help with search (ex. "cicd,gitops,golang") # Keywords to help with search (ex. "cicd,gitops,golang")
mil.dso.ironbank.image.keywords: "utilities" mil.dso.ironbank.image.keywords: "utilities"
# This value can be "opensource" or "commercial" # This value can be "opensource" or "commercial"
...@@ -37,8 +37,8 @@ labels: ...@@ -37,8 +37,8 @@ labels:
# List of resources to make available to the offline build context # List of resources to make available to the offline build context
resources: resources:
- tag: minio/mc:RELEASE.2021-05-18T03-39-44Z - tag: minio/mc:RELEASE.2021-05-26T19-19-26Z
url: docker://docker.io/minio/mc@sha256:0abf2b34337447d2440cc6ab8e33ab12ed0d8d8dd60d6d4c6f7f88c443005516 url: docker://docker.io/minio/mc@sha256:f4441290b97c27b5ef246c6d085043c421338658f008e172c370bf13d0af6b68
# List of project maintainers # List of project maintainers
maintainers: maintainers:
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment