1.2.2-r22 release

This commit is contained in:
Bitnami Bot
2018-06-28 11:08:35 +00:00
parent 8bfd52e2e1
commit 8f4e058ce4
3 changed files with 8 additions and 5 deletions

View File

@@ -13,7 +13,9 @@ LABEL maintainer "Bitnami <containers@bitnami.com>"
COPY --from=buildenv /opt/bitnami/fluentd /opt/bitnami/fluentd
ENV BITNAMI_APP_NAME="fluentd" \
BITNAMI_IMAGE_VERSION="1.2.2-r21" \
BITNAMI_IMAGE_VERSION="1.2.2-r22" \
FLUENTD_CONF="fluentd.conf" \
FLUENTD_OPT="" \
GEM_HOME="/opt/bitnami/fluentd" \
PATH="/opt/bitnami/fluentd/bin:$PATH"
@@ -26,4 +28,4 @@ COPY rootfs /
WORKDIR /opt/bitnami/fluentd
USER 1001
ENTRYPOINT ["/entrypoint.sh"]
CMD ["fluentd","-c","/opt/bitnami/fluentd/conf/fluentd.conf","-p","/opt/bitnami/fluentd/plugins"]
CMD ["fluentd","-c","/opt/bitnami/fluentd/conf/${FLUENTD_CONF}","-p","/opt/bitnami/fluentd/plugins","$FLUENTD_OPT"]

View File

@@ -1,6 +1,7 @@
#!/bin/bash
CONF_FILE='/opt/bitnami/fluentd/conf/fluentd.conf';
FLUENTD_CONF=${FLUENTD_CONF:-"fluentd.conf"}
CONF_FILE="/opt/bitnami/fluentd/conf/${FLUENTD_CONF}"
if [ ! -e ${CONF_FILE} ]; then
echo "==> Writing config file..."
@@ -46,4 +47,4 @@ else
echo "==> Detected config file. It would be used instead of creating one."
fi
exec "$@"
eval "$@"

View File

@@ -21,7 +21,7 @@ $ docker run --name fluentd bitnami/fluentd:latest
# Supported tags and respective `Dockerfile` links
* [`1`, `1.2.2-r21`, `latest` (1/Dockerfile)](https://github.com/bitnami/bitnami-docker-fluentd/blob/1.2.2-r21/1/Dockerfile)
* [`1`, `1.2.2-r22`, `latest` (1/Dockerfile)](https://github.com/bitnami/bitnami-docker-fluentd/blob/1.2.2-r22/1/Dockerfile)
* [`1-ol-7`, `1.2.2-ol-7-r9` (1/ol-7/Dockerfile)](https://github.com/bitnami/bitnami-docker-fluentd/blob/1.2.2-ol-7-r9/1/ol-7/Dockerfile)
Subscribe to project updates by watching the [bitnami/fluentd GitHub repo](https://github.com/bitnami/bitnami-docker-fluentd).