diff --git a/bitnami/fluentd/1/debian-11/Dockerfile b/bitnami/fluentd/1/debian-11/Dockerfile index aebe6ab72ebe..057ce09a3919 100644 --- a/bitnami/fluentd/1/debian-11/Dockerfile +++ b/bitnami/fluentd/1/debian-11/Dockerfile @@ -7,10 +7,10 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2024-01-03T07:23:39Z" \ + org.opencontainers.image.created="2024-01-19T19:03:04Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="1.16.3-debian-11-r3" \ + org.opencontainers.image.ref.name="1.16.3-debian-11-r4" \ org.opencontainers.image.title="fluentd" \ org.opencontainers.image.vendor="VMware, Inc." \ org.opencontainers.image.version="1.16.3" @@ -42,6 +42,7 @@ RUN apt-get autoremove --purge -y curl && \ apt-get update && apt-get upgrade -y && \ apt-get clean && rm -rf /var/lib/apt/lists /var/cache/apt/archives RUN chmod g+rwX /opt/bitnami +RUN find / -perm /6000 -type f -exec chmod a-s {} \; || true COPY rootfs / RUN /opt/bitnami/scripts/fluentd/postunpack.sh diff --git a/bitnami/fluentd/1/debian-11/docker-compose.yml b/bitnami/fluentd/1/debian-11/docker-compose.yml deleted file mode 100644 index 80039c076193..000000000000 --- a/bitnami/fluentd/1/debian-11/docker-compose.yml +++ /dev/null @@ -1,16 +0,0 @@ -# Copyright VMware, Inc. -# SPDX-License-Identifier: APACHE-2.0 - -version: '2' - -services: - fluentd: - image: docker.io/bitnami/fluentd:1 - ports: - - '24224:24224' - - '5140:5140' - volumes: - - fluentd_data:/bitnami/fluentd -volumes: - fluentd_data: - driver: local diff --git a/bitnami/fluentd/1/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/fluentd/1/debian-11/prebuildfs/usr/sbin/run-script index b7a5bf1e50bf..4ca0f897277e 100755 --- a/bitnami/fluentd/1/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/fluentd/1/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-y}" +fail_if_not_present="${3:-n}" if test -f "$script"; then sh $script diff --git a/bitnami/fluentd/README.md b/bitnami/fluentd/README.md index 29fde5ce0f93..918ff768e12a 100644 --- a/bitnami/fluentd/README.md +++ b/bitnami/fluentd/README.md @@ -107,32 +107,12 @@ You can overwrite the default configuration file by mounting your own configurat docker run --name fluentd -v /path/to/fluentd.conf:/opt/bitnami/fluentd/conf/fluentd.conf bitnami/fluentd:latest ``` -You can also do this by changing the [`docker-compose.yml`](https://github.com/bitnami/containers/blob/main/bitnami/fluentd/docker-compose.yml) file present in this repository: - -```yaml -fluentd: - ... - volumes: - - /path/to/fluentd.conf:/opt/bitnami/fluentd/conf/fluentd.conf - ... -``` - You can also extend the default configuration by importing your custom configuration with the "@include" directive. It is a simple as creating a directory with you custom config files and mount it on the directory `/opt/bitnami/fluentd/conf/conf.d`: ```console docker run --name fluentd -v /path/to/custom-conf-directory:/opt/bitnami/fluentd/conf/conf.d bitnami/fluentd:latest ``` -You can also do this by changing the [`docker-compose.yml`](https://github.com/bitnami/containers/blob/main/bitnami/fluentd/docker-compose.yml) file present in this repository: - -```yaml -fluentd: - ... - volumes: - - /path/to/custom-conf-directory:/opt/bitnami/fluentd/conf/conf.d - ... -``` - Find more information about this feature, consult [official documentation](https://docs.fluentd.org/configuration/config-file) You can also add custom init scripts to the path referenced on `$FLUENTD_INITSCRIPTS_DIR` (which defaults to `/docker-entrypoint-initdb.d`): @@ -230,6 +210,12 @@ Re-create your container from the new image, restoring your backup if necessary. docker run --name fluentd bitnami/fluentd:latest ``` +## Notable Changes + +### Starting January 16, 2024 + +* The `docker-compose.yaml` file has been removed, as it was solely intended for internal testing purposes. For production-ready deployments, we highly recommend utilizing its associated [Bitnami Helm chart](https://github.com/bitnami/charts/tree/main/bitnami/fluentd). + ## Contributing We'd love for you to contribute to this container. You can request new features by creating an [issue](https://github.com/bitnami/containers/issues) or submitting a [pull request](https://github.com/bitnami/containers/pulls) with your contribution.