UNCLASSIFIED

Skip to content

GitLab

Commit e04b5da9 authored by riveraj's avatar riveraj
Browse files

Merge branch 'development' into 'master' 

Merge Development to Master

See merge request !99
parents 93329810 197218ac
Pipeline #455237 failed with stages
in 22 minutes and 50 seconds
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 5 deletions
Dockerfile
View file @ e04b5da9
...@@ -2,7 +2,7 @@ ARG BASE_REGISTRY=registry1.dso.mil ...@@ -2,7 +2,7 @@ ARG BASE_REGISTRY=registry1.dso.mil
ARG BASE_IMAGE=ironbank/opensource/python/python38 ARG BASE_IMAGE=ironbank/opensource/python/python38
ARG BASE_TAG=3.8 ARG BASE_TAG=3.8
FROM kiwigrid/k8s-sidecar:1.12.2 as base FROM kiwigrid/k8s-sidecar:1.12.3 as base
FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG} FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG}
#FROM registry1.dsop.io/ironbank/opensource/python/python38:3.8 #FROM registry1.dsop.io/ironbank/opensource/python/python38:3.8
......
hardening_manifest.yaml
View file @ e04b5da9
...@@ -8,7 +8,7 @@ name: "kiwigrid/k8s-sidecar" ...@@ -8,7 +8,7 @@ name: "kiwigrid/k8s-sidecar"
# 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:
- "1.12.2" - "1.12.3"
- "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://github.com/kiwigrid/k8s-sidecar" org.opencontainers.image.url: "https://github.com/kiwigrid/k8s-sidecar"
## Name of the distributing entity, organization or individual ## Name of the distributing entity, organization or individual
org.opencontainers.image.vendor: "kiwigrid" org.opencontainers.image.vendor: "kiwigrid"
org.opencontainers.image.version: "1.12.2" org.opencontainers.image.version: "1.12.3"
## Keywords to help with search (ex. "cicd,gitops,golang") ## Keywords to help with search (ex. "cicd,gitops,golang")
mil.dso.ironbank.image.keywords: "opensource" mil.dso.ironbank.image.keywords: "opensource"
## 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: kiwigrid/k8s-sidecar:1.12.2 - tag: kiwigrid/k8s-sidecar:1.12.3
url: docker://docker.io/kiwigrid/k8s-sidecar@sha256:ca760f94b35eb78575b170e41d1e19e27359b29245dacfd1c42ae90452ecc08e url: docker://docker.io/kiwigrid/k8s-sidecar@sha256:eabdae16a5ccfc32fb6690423ac39d3c5bcbd9574933b02221a61f8a8c4671a3
- filename: "pip-21.2.4-py2.py3-none-any.whl" - filename: "pip-21.2.4-py2.py3-none-any.whl"
url: "https://files.pythonhosted.org/packages/ca/31/b88ef447d595963c01060998cb329251648acf4a067721b0452c45527eb8/pip-21.2.4-py3-none-any.whl" url: "https://files.pythonhosted.org/packages/ca/31/b88ef447d595963c01060998cb329251648acf4a067721b0452c45527eb8/pip-21.2.4-py3-none-any.whl"
......
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

UNCLASSIFIED