UNCLASSIFIED

Commit 2c10dd2a authored by Joshua Eason's avatar Joshua Eason
Browse files

Merge branch 'update-v0.48.1' into 'development'

Updating to v048.1

See merge request !18
parents ca1607f0 9b07eaf0
Pipeline #402366 passed with stages
in 25 minutes and 48 seconds
......@@ -2,7 +2,7 @@ ARG BASE_REGISTRY=registry1.dso.mil
ARG BASE_IMAGE=ironbank/opensource/nginx/nginx
ARG BASE_TAG=1.20.1
FROM k8s.gcr.io/ingress-nginx/controller:v0.47.0 as base
FROM k8s.gcr.io/ingress-nginx/controller:v0.48.1 as base
FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG}
......@@ -51,7 +51,6 @@ COPY --from=base --chown=nginx:nginx /usr/lib/libGeoIP.so.1 /usr/lib/libGeoIP.so
COPY --from=base --chown=nginx:nginx /usr/lib/libgcc_s.so.1 /usr/lib/libgcc_s.so.1
COPY --from=base --chown=nginx:nginx /etc/ingress-controller /etc/ingress-controller
COPY --from=base --chown=nginx:nginx /etc/nginx /etc/nginx/
COPY --from=base --chown=nginx:nginx /ingress-controller /ingress-controller
COPY --from=base --chown=nginx:nginx /dbg /dbg
COPY --from=base --chown=nginx:nginx /nginx-ingress-controller /nginx-ingress-controller
COPY --from=base --chown=nginx:nginx /wait-shutdown /wait-shutdown
......
......@@ -6,7 +6,7 @@ name: "opensource/kubernetes/ingress-nginx"
# The most specific version should be the first tag and will be shown
# on ironbank.dsop.io
tags:
- "0.47.0"
- "v0.48.1"
- "latest"
# Build args passed to Dockerfile ARGs
args:
......@@ -23,7 +23,7 @@ labels:
org.opencontainers.image.url: "https://kubernetes.github.io/ingress-nginx/"
## Name of the distributing entity, organization or individual
org.opencontainers.image.vendor: "ingress-nginx-controller"
org.opencontainers.image.version: "0.47.0"
org.opencontainers.image.version: "v0.48.1"
## Keywords to help with search (ex. "cicd,gitops,golang")
mil.dso.ironbank.image.keywords: "ingress, controller"
## This value can be "opensource" or "commercial"
......@@ -32,8 +32,8 @@ labels:
mil.dso.ironbank.product.name: "ingress-nginx-controller"
# List of resources to make available to the offline build context
resources:
- tag: k8s.gcr.io/ingress-nginx/controller:v0.47.0
url: docker://k8s.gcr.io/ingress-nginx/controller@sha256:a1e4efc107be0bb78f32eaec37bef17d7a0c81bec8066cdf2572508d21351d0b
- tag: k8s.gcr.io/ingress-nginx/controller:v0.48.1
url: docker://k8s.gcr.io/ingress-nginx/controller@sha256:e9fb216ace49dfa4a5983b183067e97496e7a8b307d2093f4278cd550c303899
- filename: musl-1.2.2.tar.gz
url: https://musl.libc.org/releases/musl-1.2.2.tar.gz
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