UNCLASSIFIED

Skip to content

GitLab

Commit 4f236bf3 authored by Andy Maksymowicz's avatar Andy Maksymowicz
Browse files

Merge branch 'development' into 'master' 

Master: Renovate: Automerge Update dependency without new findings

See merge request !91
parents 86fa65ff 7e4f8e4b
Pipeline #456825 passed with stages
in 21 minutes and 2 seconds
Hide whitespace changes
Inline Side-by-side
Showing with 7 additions and 7 deletions
Dockerfile
View file @ 4f236bf3
...@@ -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.4 as flb FROM fluent/fluent-bit:1.8.5 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 @ 4f236bf3
...@@ -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.4" - "1.8.5"
- "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.4" org.opencontainers.image.version: "1.8.5"
# 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.4 - tag: fluent/fluent-bit:1.8.5
url: docker://docker.io/fluent/fluent-bit@sha256:2d80c13c2e7e06aa6a2e54a1825c6adbb3829c8a133ff617a0a61790bd61c53d url: docker://docker.io/fluent/fluent-bit@sha256:35172bf9bf04cb041963d0aefd895f817d8085a9e8c3e79275e437c4e114310e
- 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.4.tar.gz url: https://github.com/fluent/fluent-bit/archive/refs/tags/v1.8.5.tar.gz
validation: validation:
type: sha256 type: sha256
value: 9debe7b13e0ebb093058d4ca75125c980b38226bd4928f908357a894691f397d value: e2b65a22251403fbf6ef0e405acb11e56618ef2cef92459911bbed38e87f6a06
# 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