UNCLASSIFIED

Commit 76b069d1 authored by Andy Maksymowicz's avatar Andy Maksymowicz
Browse files

Merge branch 'development' into 'master'

Development

See merge request !37
parents 33b633ef 15e703f2
Pipeline #299536 passed with stages
in 15 minutes and 17 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/opensource/nodejs/nodejs12 ARG BASE_IMAGE=ironbank/opensource/nodejs/nodejs12
ARG BASE_TAG=12.22.1 ARG BASE_TAG=12.22.1
FROM ghcr.io/external-secrets/kubernetes-external-secrets:8.0.1 as builder FROM ghcr.io/external-secrets/kubernetes-external-secrets:8.1.1 as builder
FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG} FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG}
......
...@@ -8,7 +8,7 @@ name: "opensource/external-secrets/kubernetes-external-secrets" ...@@ -8,7 +8,7 @@ name: "opensource/external-secrets/kubernetes-external-secrets"
# 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:
- "8.0.1" - "8.1.1"
- "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/external-secrets/kubernetes-external-secrets" org.opencontainers.image.url: "https://github.com/external-secrets/kubernetes-external-secrets"
## Name of the distributing entity, organization or individual ## Name of the distributing entity, organization or individual
org.opencontainers.image.vendor: "godaddy" org.opencontainers.image.vendor: "godaddy"
org.opencontainers.image.version: "8.0.1" org.opencontainers.image.version: "8.1.1"
## Keywords to help with search (ex. "cicd,gitops,golang") ## Keywords to help with search (ex. "cicd,gitops,golang")
mil.dso.ironbank.image.keywords: "gitops,kubernetes,secrets" mil.dso.ironbank.image.keywords: "gitops,kubernetes,secrets"
## This value can be "opensource" or "commercial" ## This value can be "opensource" or "commercial"
...@@ -35,8 +35,8 @@ labels: ...@@ -35,8 +35,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: ghcr.io/external-secrets/kubernetes-external-secrets:8.0.1 - tag: ghcr.io/external-secrets/kubernetes-external-secrets:8.1.1
url: docker://ghcr.io/external-secrets/kubernetes-external-secrets@sha256:5b6daeed825415ee14c3808247e459de247fea6c12cb1af50ffbd6745dbef36c url: docker://ghcr.io/external-secrets/kubernetes-external-secrets@sha256:76b1e4948ddd1bac562248bac9fe2149b9b96d1b319fb7cf1c6ad07e9d13e5e1
# List of project maintainers # List of project maintainers
maintainers: maintainers:
......
...@@ -18,6 +18,8 @@ ...@@ -18,6 +18,8 @@
} }
} }
], ],
"automerge": true,
"gitLabAutomerge": true,
"regexManagers": [ "regexManagers": [
{ {
"fileMatch": [ "fileMatch": [
......
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