UNCLASSIFIED

Skip to content

GitLab

Commit 551a547b authored by riveraj's avatar riveraj
Browse files

Merge branch 'development' into 'master' 

Master: Renovate: Automerge Update dependency without new findings

See merge request !74
parents 021aba00 37255865
Pipeline #379177 failed with stages
in 28 minutes and 5 seconds
Hide whitespace changes
Inline Side-by-side
Showing with 7 additions and 7 deletions
Dockerfile
View file @ 551a547b
...@@ -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.0 as flb FROM fluent/fluent-bit:1.8.1 as flb
FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG} as build FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG} as build
......
hardening_manifest.yaml
View file @ 551a547b
...@@ -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.0" - "1.8.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://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.0" org.opencontainers.image.version: "1.8.1"
# 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.0 - tag: fluent/fluent-bit:1.8.1
url: docker://docker.io/fluent/fluent-bit@sha256:caf732b5ef784d87eef74ee18c5c98e699a82be802d853be65fa802b59b12053 url: docker://docker.io/fluent/fluent-bit@sha256:67f4d2a903fada0024f1254c36b83b8cd13243ca37b978adf4365399b4fc3076
- 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:
...@@ -55,10 +55,10 @@ resources: ...@@ -55,10 +55,10 @@ resources:
type: sha256 type: sha256
value: e87aae032bf07c26f85ac0ed3250998c37621d95f8bd748b31f15b33c45ee995 value: e87aae032bf07c26f85ac0ed3250998c37621d95f8bd748b31f15b33c45ee995
- filename: fluent-bit.tar.gz - filename: fluent-bit.tar.gz
url: https://github.com/fluent/fluent-bit/archive/refs/tags/v1.8.0.tar.gz url: https://github.com/fluent/fluent-bit/archive/refs/tags/v1.8.1.tar.gz
validation: validation:
type: sha256 type: sha256
value: f7d9223e784607f78673f858deab2e3cfed95a4af39fa63366af83a4987e9aaa value: a284d803ec9203be69b7c4ff9febb33b8c938b640f0cc7cbcf6f9223e5de4fb5
# List of project maintainers # List of project maintainers
maintainers: maintainers:
......
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