UNCLASSIFIED

Commit cf5bde50 authored by Hunter Stevens's avatar Hunter Stevens
Browse files

Merge branch 'development' into 'master'

Master: Renovate: Automerge Update dependency without new findings

See merge request !82
parents 103f0d2d 10ff58f4
Pipeline #433160 passed with stages
in 19 minutes and 48 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=8.4 ARG BASE_TAG=8.4
FROM fluent/fluent-bit:1.8.2 as flb FROM fluent/fluent-bit:1.8.3 as flb
FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG} as build FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG} as build
......
...@@ -8,7 +8,7 @@ name: "opensource/fluent/fluent-bit" ...@@ -8,7 +8,7 @@ name: "opensource/fluent/fluent-bit"
# 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.8.2" - "1.8.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://repo1.dso.mil/dsop/opensource/fluent/fluent-bit" org.opencontainers.image.url: "https://repo1.dso.mil/dsop/opensource/fluent/fluent-bit"
# Name of the distributing entity, organization or individual # Name of the distributing entity, organization or individual
org.opencontainers.image.vendor: "Fluent" org.opencontainers.image.vendor: "Fluent"
org.opencontainers.image.version: "1.8.2" org.opencontainers.image.version: "1.8.3"
# Keywords to help with search (ex. "cicd,gitops,golang") # Keywords to help with search (ex. "cicd,gitops,golang")
mil.dso.ironbank.image.keywords: "log,stash,search,elk" mil.dso.ironbank.image.keywords: "log,stash,search,elk"
# 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: fluent/fluent-bit:1.8.2 - tag: fluent/fluent-bit:1.8.3
url: docker://docker.io/fluent/fluent-bit@sha256:32f416a1c26201ad4e2a7be0a1fa45356c87f532628cb198ed9434b1416cd89d url: docker://docker.io/fluent/fluent-bit@sha256:10ea2709cef6e7059d980b4969d5f9d753ef97278a817c214cbe9120b1152082
- filename: texinfo.tar.gz - filename: texinfo.tar.gz
url: https://ftp.gnu.org/gnu/texinfo/texinfo-6.7.tar.gz url: https://ftp.gnu.org/gnu/texinfo/texinfo-6.7.tar.gz
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