UNCLASSIFIED

Skip to content

GitLab

Commit 38ec8dd0 authored by Vickie Shen's avatar Vickie Shen
Browse files

Merge branch 'update-contrib' into 'development' 

bumped to v1.19.12

See merge request !32
parents b4cfc761 d6dcdbb9
Pipeline #329115 passed with stages
in 16 minutes and 24 seconds
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 5 deletions
Dockerfile
View file @ 38ec8dd0
...@@ -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=8.4 ARG BASE_TAG=8.4
FROM k8s.gcr.io/kube-proxy:v1.21.2 as base FROM k8s.gcr.io/kube-proxy:v1.19.12 as base
FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG} FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG}
......
hardening_manifest.yaml
View file @ 38ec8dd0
...@@ -8,7 +8,7 @@ name: "opensource/kubernetes-1.19/kube-proxy-1.19" ...@@ -8,7 +8,7 @@ name: "opensource/kubernetes-1.19/kube-proxy-1.19"
# 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:
- "v1.21.2" - "v1.19.12"
- "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: "docker://k8s.gcr.io/kube-proxy" org.opencontainers.image.url: "docker://k8s.gcr.io/kube-proxy"
## Name of the distributing entity, organization or individual ## Name of the distributing entity, organization or individual
org.opencontainers.image.vendor: "opensource" org.opencontainers.image.vendor: "opensource"
org.opencontainers.image.version: "v1.21.2" org.opencontainers.image.version: "v1.19.12"
## Keywords to help with search (ex. "cicd,gitops,golang") ## Keywords to help with search (ex. "cicd,gitops,golang")
mil.dso.ironbank.image.keywords: "kube-proxy" mil.dso.ironbank.image.keywords: "kube-proxy"
## 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:
- url: docker://k8s.gcr.io/kube-proxy@sha256:3ee783402715225d6bc483b3a2f8ea11adcb997d00fb5ca2f74734023ade0561 - url: docker://k8s.gcr.io/kube-proxy@sha256:83e84ab21ed53df6fe0e53d453819d0efa90a58e5dd9dfe55b4c671a01d57052
tag: k8s.gcr.io/kube-proxy:v1.21.2 tag: k8s.gcr.io/kube-proxy:v1.19.12
- filename: libnetfilter_cthelper.rpm - filename: libnetfilter_cthelper.rpm
url: http://mirror.centos.org/centos/8/BaseOS/x86_64/os/Packages/libnetfilter_cthelper-1.0.0-15.el8.x86_64.rpm url: http://mirror.centos.org/centos/8/BaseOS/x86_64/os/Packages/libnetfilter_cthelper-1.0.0-15.el8.x86_64.rpm
validation: validation:
......
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