scottk/kubernetes
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/kubernetes.git synced 2025-11-03 19:58:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #12942 from satnam6502/fluentd-es-image

Browse Source 
Fetch fluentd td agent securely
This commit is contained in:
Saad Ali
2015-08-19 14:48:15 -07:00
parent d49b9154f8 278a3911fd
commit 5c7217c6ee
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cluster/addons/fluentd-elasticsearch/fluentd-es-image/Dockerfile
View File

@@ -24,7 +24,7 @@ RUN apt-get update && \
apt-get clean apt-get clean
# Install Fluentd. # Install Fluentd.
RUN /usr/bin/curl -L http://toolbelt.treasuredata.com/sh/install-ubuntu-trusty-td-agent2.sh | sh RUN /usr/bin/curl -L https://td-toolbelt.herokuapp.com/sh/install-ubuntu-trusty-td-agent2.sh | sh
# Change the default user and group to root. # Change the default user and group to root.
# Needed to allow access to /var/log/docker/... files. # Needed to allow access to /var/log/docker/... files.

2
cluster/addons/fluentd-elasticsearch/fluentd-es-image/Makefile
View File

@@ -1,7 +1,7 @@
.PHONY: build push .PHONY: build push
IMAGE = fluentd-elasticsearch IMAGE = fluentd-elasticsearch
TAG = 1.8 TAG = 1.9
build: build:
docker build -t gcr.io/google_containers/$(IMAGE):$(TAG) . docker build -t gcr.io/google_containers/$(IMAGE):$(TAG) .