Merge pull request #1 from bitnami/remove_debian_8

Removed Debian 8 from root version folders
This commit is contained in:
Carlos Rodríguez Hernández 2018-09-21 10:44:54 +02:00 committed by GitHub
commit a01fa9f74d
3 changed files with 0 additions and 94 deletions

View File

@ -1,31 +0,0 @@
FROM bitnami/ruby:latest-prod as buildenv
RUN install_packages ca-certificates libc6 libgcc1 libstdc++6 wget
RUN wget -nc -P /tmp/bitnami/pkg/cache/ https://downloads.bitnami.com/files/stacksmith/fluentd-1.2.2-2-linux-x64-debian-8.tar.gz && \
echo "18ffed6b73ecfdf8670c1787fec771ff30a585eba357a2416187221f8dd465b5 /tmp/bitnami/pkg/cache/fluentd-1.2.2-2-linux-x64-debian-8.tar.gz" | sha256sum -c - && \
tar -zxf /tmp/bitnami/pkg/cache/fluentd-1.2.2-2-linux-x64-debian-8.tar.gz -P --transform 's|^[^/]*/files|/opt/bitnami|' --wildcards '*/files' && \
rm -rf /tmp/bitnami/pkg/cache/fluentd-1.2.2-2-linux-x64-debian-8.tar.gz
##################
FROM bitnami/ruby:latest-prod
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-debian-8-r30" \
FLUENTD_CONF="fluentd.conf" \
FLUENTD_OPT="" \
GEM_HOME="/opt/bitnami/fluentd" \
PATH="/opt/bitnami/fluentd/bin:$PATH"
RUN install_packages ca-certificates libjemalloc-dev
RUN chmod g+rwX /opt/bitnami/fluentd/conf /opt/bitnami/fluentd/logs
EXPOSE 24224 5140
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","$FLUENTD_OPT"]

View File

@ -1,13 +0,0 @@
version: '2'
services:
fluentd:
image: bitnami/fluentd:1
ports:
- '24224:24224'
- '5140:5140'
volumes:
- fluentd_data:/bitnami
volumes:
fluentd_data:
driver: local

View File

@ -1,50 +0,0 @@
#!/bin/bash
FLUENTD_CONF=${FLUENTD_CONF:-"fluentd.conf"}
CONF_FILE="/opt/bitnami/fluentd/conf/${FLUENTD_CONF}"
if [ ! -e ${CONF_FILE} ]; then
echo "==> Writing config file..."
cat > ${CONF_FILE} << EOF
<source>
@type forward
@id input1
@label @mainstream
port 24224
</source>
<filter **>
@type stdout
</filter>
<label @mainstream>
<match docker.**>
@type file
@id output_docker1
path /opt/bitnami/fluentd/logs/docker.*.log
symlink_path /opt/bitnami/fluentd/logs/docker.log
append true
time_slice_format %Y%m%d
time_slice_wait 1m
time_format %Y%m%dT%H%M%S%z
</match>
<match **>
@type file
@id output1
path /opt/bitnami/fluentd/logs/data.*.log
symlink_path /opt/bitnami/fluentd/logs/data.log
append true
time_slice_format %Y%m%d
time_slice_wait 10m
time_format %Y%m%dT%H%M%S%z
</match>
</label>
# Include config files in the ./config.d directory
@include config.d/*.conf
EOF
else
echo "==> Detected config file. It would be used instead of creating one."
fi
eval "$@"