Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

cmake: update emails and urls for Chronosphere #9408

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -1149,8 +1149,8 @@ set(CPACK_PACKAGE_VERSION ${FLB_VERSION_STR})
set(CPACK_PACKAGE_NAME "fluent-bit")

set(CPACK_PACKAGE_RELEASE 1)
set(CPACK_PACKAGE_CONTACT "Eduardo Silva <eduardo@calyptia.com>")
set(CPACK_PACKAGE_VENDOR "Calyptia Inc.")
set(CPACK_PACKAGE_CONTACT "Eduardo Silva <eduardo[email protected]>")
set(CPACK_PACKAGE_VENDOR "Chronosphere Inc.")
set(CPACK_RESOURCE_FILE_LICENSE "${PROJECT_SOURCE_DIR}/LICENSE")
set(CPACK_PACKAGING_INSTALL_PREFIX "/")

Expand Down
8 changes: 4 additions & 4 deletions MAINTAINERS.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@ Fluent Bit is developed and supported by many individuals and companies. The fo

| Maintainer Name | Components | Company |
| :---------------------------------------------------- | ------------------------ | ------------------------------------------------- |
| [Eduardo Silva](https://github.com/edsiper) | All | [Calyptia](https://calyptia.com) |
| [Leonardo Alminana](https://github.com/leonardo-albertovich) | All | [Calyptia](https://calyptia.com) |
| [Eduardo Silva](https://github.com/edsiper) | All | [Chronosphere](https://chronosphere.io) |
| [Leonardo Alminana](https://github.com/leonardo-albertovich) | All | [Chronosphere](https://chronosphere.io) |
| [Masoud Koleini](https://github.com/koleini) | Stream Processor | [Arm](https://www.arm.com/) |
| [Hiroshi Hatake](https://github.com/cosmo0920) | All | [Calyptia](https://calyptia.com) |
| [Hiroshi Hatake](https://github.com/cosmo0920) | All | [Chronosphere](https://chronosphere.io) |
| [Fujimoto Seiji](https://github.com/fujimotos) | Windows Platform | Individual |
| [Wesley Pettit](https://github.com/PettitWesley) | Amazon Plugins (AWS) | [Amazon Web Services](https://aws.amazon.com/) |
| [Cedric Lamoriniere](https://github.com/clamoriniere) | Datadog Output Plugin | [Datadog](https://www.datadoghq.com/) |
| [Jonathan Gonzalez V.](https://github.com/sxd) | PostgreSQL Output Plugin | [2ndQuadrant](https://www.2ndquadrant.com/en/) |
| [Jorge Niedbalski](https://github.com/niedbalski) | CI && Containers | [Calyptia](https://calyptia.com/) |
| [Jorge Niedbalski](https://github.com/niedbalski) | CI && Containers | [Personal Blog](https://niedbalski.dev/) |
8 changes: 4 additions & 4 deletions dockerfiles/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@
ARG RELEASE_VERSION=3.1.7

# For multi-arch builds - assumption is running on an AMD64 host
FROM multiarch/qemu-user-static:x86_64-arm as qemu-arm32

Check warning on line 17 in dockerfiles/Dockerfile

View workflow job for this annotation

GitHub Actions / PR - Buildkit docker build test

The 'as' keyword should match the case of the 'from' keyword

FromAsCasing: 'as' and 'FROM' keywords' casing do not match More info: https://docs.docker.com/go/dockerfile/rule/from-as-casing/

Check warning on line 17 in dockerfiles/Dockerfile

View workflow job for this annotation

GitHub Actions / PR - Buildkit docker build test

The 'as' keyword should match the case of the 'from' keyword

FromAsCasing: 'as' and 'FROM' keywords' casing do not match More info: https://docs.docker.com/go/dockerfile/rule/from-as-casing/
FROM multiarch/qemu-user-static:x86_64-aarch64 as qemu-arm64

Check warning on line 18 in dockerfiles/Dockerfile

View workflow job for this annotation

GitHub Actions / PR - Buildkit docker build test

The 'as' keyword should match the case of the 'from' keyword

FromAsCasing: 'as' and 'FROM' keywords' casing do not match More info: https://docs.docker.com/go/dockerfile/rule/from-as-casing/

Check warning on line 18 in dockerfiles/Dockerfile

View workflow job for this annotation

GitHub Actions / PR - Buildkit docker build test

The 'as' keyword should match the case of the 'from' keyword

FromAsCasing: 'as' and 'FROM' keywords' casing do not match More info: https://docs.docker.com/go/dockerfile/rule/from-as-casing/

FROM debian:bookworm-slim as builder-base

Check warning on line 20 in dockerfiles/Dockerfile

View workflow job for this annotation

GitHub Actions / PR - Buildkit docker build test

The 'as' keyword should match the case of the 'from' keyword

FromAsCasing: 'as' and 'FROM' keywords' casing do not match More info: https://docs.docker.com/go/dockerfile/rule/from-as-casing/

Check warning on line 20 in dockerfiles/Dockerfile

View workflow job for this annotation

GitHub Actions / PR - Buildkit docker build test

The 'as' keyword should match the case of the 'from' keyword

FromAsCasing: 'as' and 'FROM' keywords' casing do not match More info: https://docs.docker.com/go/dockerfile/rule/from-as-casing/

COPY --from=qemu-arm32 /usr/bin/qemu-arm-static /usr/bin/
COPY --from=qemu-arm64 /usr/bin/qemu-aarch64-static /usr/bin/
Expand All @@ -30,7 +30,7 @@

RUN mkdir -p /fluent-bit/bin /fluent-bit/etc /fluent-bit/log

ENV DEBIAN_FRONTEND noninteractive

Check warning on line 33 in dockerfiles/Dockerfile

View workflow job for this annotation

GitHub Actions / PR - Buildkit docker build test

Legacy key/value format with whitespace separator should not be used

LegacyKeyValueFormat: "ENV key=value" should be used instead of legacy "ENV key value" format More info: https://docs.docker.com/go/dockerfile/rule/legacy-key-value-format/

Check warning on line 33 in dockerfiles/Dockerfile

View workflow job for this annotation

GitHub Actions / PR - Buildkit docker build test

Legacy key/value format with whitespace separator should not be used

LegacyKeyValueFormat: "ENV key=value" should be used instead of legacy "ENV key value" format More info: https://docs.docker.com/go/dockerfile/rule/legacy-key-value-format/

# hadolint ignore=DL3008
RUN echo "deb http://deb.debian.org/debian bookworm-backports main" >> /etc/apt/sources.list && \
Expand Down Expand Up @@ -61,7 +61,7 @@
COPY . ./

# We split the builder setup out so people can target it or use as a base image without doing a full build.
FROM builder-base as builder

Check warning on line 64 in dockerfiles/Dockerfile

View workflow job for this annotation

GitHub Actions / PR - Buildkit docker build test

The 'as' keyword should match the case of the 'from' keyword

FromAsCasing: 'as' and 'FROM' keywords' casing do not match More info: https://docs.docker.com/go/dockerfile/rule/from-as-casing/

Check warning on line 64 in dockerfiles/Dockerfile

View workflow job for this annotation

GitHub Actions / PR - Buildkit docker build test

The 'as' keyword should match the case of the 'from' keyword

FromAsCasing: 'as' and 'FROM' keywords' casing do not match More info: https://docs.docker.com/go/dockerfile/rule/from-as-casing/
WORKDIR /src/fluent-bit/build/
RUN cmake -DFLB_RELEASE=On \
-DFLB_JEMALLOC=On \
Expand Down Expand Up @@ -97,7 +97,7 @@

# Simple example of how to properly extract packages for reuse in distroless
# Taken from: https://github.com/GoogleContainerTools/distroless/issues/863
FROM debian:bookworm-slim as deb-extractor

Check warning on line 100 in dockerfiles/Dockerfile

View workflow job for this annotation

GitHub Actions / PR - Buildkit docker build test

The 'as' keyword should match the case of the 'from' keyword

FromAsCasing: 'as' and 'FROM' keywords' casing do not match More info: https://docs.docker.com/go/dockerfile/rule/from-as-casing/

Check warning on line 100 in dockerfiles/Dockerfile

View workflow job for this annotation

GitHub Actions / PR - Buildkit docker build test

The 'as' keyword should match the case of the 'from' keyword

FromAsCasing: 'as' and 'FROM' keywords' casing do not match More info: https://docs.docker.com/go/dockerfile/rule/from-as-casing/
COPY --from=qemu-arm32 /usr/bin/qemu-arm-static /usr/bin/
COPY --from=qemu-arm64 /usr/bin/qemu-aarch64-static /usr/bin/

Expand Down Expand Up @@ -154,21 +154,21 @@

# We want latest at time of build
# hadolint ignore=DL3006
FROM gcr.io/distroless/cc-debian12 as production

Check warning on line 157 in dockerfiles/Dockerfile

View workflow job for this annotation

GitHub Actions / PR - Buildkit docker build test

The 'as' keyword should match the case of the 'from' keyword

FromAsCasing: 'as' and 'FROM' keywords' casing do not match More info: https://docs.docker.com/go/dockerfile/rule/from-as-casing/

Check warning on line 157 in dockerfiles/Dockerfile

View workflow job for this annotation

GitHub Actions / PR - Buildkit docker build test

The 'as' keyword should match the case of the 'from' keyword

FromAsCasing: 'as' and 'FROM' keywords' casing do not match More info: https://docs.docker.com/go/dockerfile/rule/from-as-casing/
ARG RELEASE_VERSION
ENV FLUENT_BIT_VERSION=${RELEASE_VERSION}
LABEL description="Fluent Bit multi-architecture container image" \
vendor="Fluent Organization" \
version="${RELEASE_VERSION}" \
author="Eduardo Silva <eduardo@calyptia.com>" \
author="Eduardo Silva <eduardo[email protected]>" \
org.opencontainers.image.description="Fluent Bit container image" \
org.opencontainers.image.title="Fluent Bit" \
org.opencontainers.image.licenses="Apache-2.0" \
org.opencontainers.image.vendor="Fluent Organization" \
org.opencontainers.image.version="${RELEASE_VERSION}" \
org.opencontainers.image.source="https://github.com/fluent/fluent-bit" \
org.opencontainers.image.documentation="https://docs.fluentbit.io/" \
org.opencontainers.image.authors="Eduardo Silva <eduardo@calyptia.com>"
org.opencontainers.image.authors="Eduardo Silva <eduardo[email protected]>"

# Copy the libraries from the extractor stage into root
COPY --from=deb-extractor /dpkg /
Expand All @@ -185,25 +185,25 @@
ENTRYPOINT [ "/fluent-bit/bin/fluent-bit" ]
CMD ["/fluent-bit/bin/fluent-bit", "-c", "/fluent-bit/etc/fluent-bit.conf"]

FROM debian:bookworm-slim as debug

Check warning on line 188 in dockerfiles/Dockerfile

View workflow job for this annotation

GitHub Actions / PR - Buildkit docker build test

The 'as' keyword should match the case of the 'from' keyword

FromAsCasing: 'as' and 'FROM' keywords' casing do not match More info: https://docs.docker.com/go/dockerfile/rule/from-as-casing/

Check warning on line 188 in dockerfiles/Dockerfile

View workflow job for this annotation

GitHub Actions / PR - Buildkit docker build test

The 'as' keyword should match the case of the 'from' keyword

FromAsCasing: 'as' and 'FROM' keywords' casing do not match More info: https://docs.docker.com/go/dockerfile/rule/from-as-casing/
ARG RELEASE_VERSION
ENV FLUENT_BIT_VERSION=${RELEASE_VERSION}
LABEL description="Fluent Bit multi-architecture debug container image" \
vendor="Fluent Organization" \
version="${RELEASE_VERSION}-debug" \
author="Eduardo Silva <eduardo@calyptia.com>" \
author="Eduardo Silva <eduardo[email protected]>" \
org.opencontainers.image.description="Fluent Bit debug container image" \
org.opencontainers.image.title="Fluent Bit Debug" \
org.opencontainers.image.licenses="Apache-2.0" \
org.opencontainers.image.vendor="Fluent Organization" \
org.opencontainers.image.version="${RELEASE_VERSION}-debug" \
org.opencontainers.image.source="https://github.com/fluent/fluent-bit" \
org.opencontainers.image.documentation="https://docs.fluentbit.io/" \
org.opencontainers.image.authors="Eduardo Silva <eduardo@calyptia.com>"
org.opencontainers.image.authors="Eduardo Silva <eduardo[email protected]>"

COPY --from=qemu-arm32 /usr/bin/qemu-arm-static /usr/bin/
COPY --from=qemu-arm64 /usr/bin/qemu-aarch64-static /usr/bin/
ENV DEBIAN_FRONTEND noninteractive

Check warning on line 206 in dockerfiles/Dockerfile

View workflow job for this annotation

GitHub Actions / PR - Buildkit docker build test

Legacy key/value format with whitespace separator should not be used

LegacyKeyValueFormat: "ENV key=value" should be used instead of legacy "ENV key value" format More info: https://docs.docker.com/go/dockerfile/rule/legacy-key-value-format/

# hadolint ignore=DL3008
RUN echo "deb http://deb.debian.org/debian bookworm-backports main" >> /etc/apt/sources.list && \
Expand Down
2 changes: 1 addition & 1 deletion dockerfiles/Dockerfile.windows
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ LABEL org.opencontainers.image.title="Fluent Bit" `
org.opencontainers.image.description="Fluent Bit is an open source and multi-platform Log Processor and Forwarder which allows you to collect data/logs from different sources, unify and send them to multiple destinations. It's fully compatible with Docker and Kubernetes environments." `
org.opencontainers.image.created=$IMAGE_CREATE_DATE `
org.opencontainers.image.version=$FLUENTBIT_VERSION `
org.opencontainers.image.authors="Eduardo Silva <eduardo@calyptia.com>" `
org.opencontainers.image.authors="Eduardo Silva <eduardo[email protected]>" `
org.opencontainers.image.url="https://hub.docker.com/r/fluent/fluent-bit" `
org.opencontainers.image.documentation="https://docs.fluentbit.io/manual/" `
org.opencontainers.image.vendor="Fluent Organization" `
Expand Down
Loading