Skip to content

Commit 3898e76

Browse files
committed
chore(fluent): upgrade fluent to v1.4
Signed-off-by: Cryptophobia <aouzounov@gmail.com>
1 parent 4199cfc commit 3898e76

3 files changed

Lines changed: 6 additions & 4 deletions

File tree

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
manifests/*.tmp.yaml
2-
rootfs/fluentd/hephy-output/pkg
2+
rootfs/fluentd/deis-output/pkg
33
rootfs/*.gem

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ docker-build:
1313
docker tag ${IMAGE} ${MUTABLE_IMAGE}
1414

1515
test: docker-build
16-
docker run ${IMAGE} /bin/bash -c "cd /fluentd/hephy-output && rake test"
16+
docker run ${IMAGE} /bin/bash -c "cd /fluentd/deis-output && rake test"
1717

1818
install:
1919
helm upgrade fluentd charts/fluentd --install --namespace deis --set org=${IMAGE_PREFIX},docker_tag=${VERSION}

rootfs/Dockerfile

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
FROM fluent/fluentd:v1.3
1+
FROM fluent/fluentd:v1.4
2+
3+
USER root
24

35
COPY fluentd /fluentd
46
COPY entrypoint.sh /bin/
@@ -15,7 +17,7 @@ RUN apk add --update --virtual .build-deps sudo build-base ruby-dev \
1517
&& fluent-gem install --no-document fluent-plugin-remote_syslog -v 1.0.0 \
1618
&& fluent-gem install --no-document fluent-plugin-sumologic-mattk42 -v 0.0.4 \
1719
&& fluent-gem install --no-document fluent-plugin-gelf-hs -v 1.0.7 \
18-
&& fluent-gem install --no-document influxdb -v 0.6.1 \
20+
&& fluent-gem install --no-document influxdb -v 0.7.0 \
1921
&& fluent-gem install --no-document nsq-ruby -v 2.3.1 \
2022
&& fluent-gem install --local /fluentd/deis-output/pkg/fluent-plugin-deis_output-0.1.0.gem \
2123
&& sudo gem sources --clear-all \

0 commit comments

Comments
 (0)