UNCLASSIFIED

Commit 8b651f85 authored by Andy Maksymowicz's avatar Andy Maksymowicz
Browse files

Merge branch 'development' into 'master'

Master: Update fluent/fluent-bit Docker tag to v1.7.9

See merge request !67
parents 4f1ebd32 ff73a336
Pipeline #355338 passed with stages
in 28 minutes and 46 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.7.8 as flb FROM fluent/fluent-bit:1.7.9 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.7.8" - "1.7.9"
- "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.7.8" org.opencontainers.image.version: "1.7.9"
# 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.7.8 - tag: fluent/fluent-bit:1.7.9
url: docker://docker.io/fluent/fluent-bit@sha256:e11febad44c0593e97a55b864b535a3165e42bc7642092ab97dbe80ba8044100 url: docker://docker.io/fluent/fluent-bit@sha256:c3fe3469d3bc6459e701a32d66a592cf1a88304f850ea94dfd0405dfef9152d8
- 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.7.8.tar.gz url: https://github.com/fluent/fluent-bit/archive/refs/tags/v1.7.9.tar.gz
validation: validation:
type: sha256 type: sha256
value: e31541570757d70510194ea2cbe6a34bdea88791fd93f04c9800b9bf8188eaf4 value: 6f1632c26ebf5e1463393656e262d9b36bbf10a454300ad8b3af5a6b2c66927f
# 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