github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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

Switch to versioned image and Makefile for Fluentd/Elasticsearch image
pull/6/head
Daniel Smith 2014-11-07 15:06:04 -08:00
parent 14d0dbd240 99356d2a65
commit acd4fdca9b
4 changed files with 9 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
contrib/logging/fluentd-es-image/Makefile Normal file
View File

@ -0,0 +1,9 @@
.PHONY: build push
TAG = 1.0
build:
sudo docker build -t kubernetes/fluentd-elasticsearch:$(TAG) .
push:
sudo docker push kubernetes/fluentd-elasticsearch:$(TAG)

20
contrib/logging/fluentd-es-image/build.sh
View File

@ -1,20 +0,0 @@
#!/bin/bash
# Copyright 2014 Google Inc. All rights reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
# Build the fluentd-elasticsearch image,
sudo docker build -t kubernetes/fluentd-elasticsearch .

19
contrib/logging/fluentd-es-image/push.sh
View File

@ -1,19 +0,0 @@
#!/bin/bash
# Copyright 2014 Google Inc. All rights reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
# Push built inmage to kubernetes/fluentd-elasticsearch.
sudo docker push kubernetes/fluentd-elasticsearch

1
contrib/logging/fluentd-es-image/td-agent.conf
View File

@ -38,7 +38,6 @@
format json
time_key time
path /var/lib/docker/containers/*/*-json.log
pos_file /var/lib/docker/containers/*/*-json.log.pos
time_format %Y-%m-%dT%H:%M:%S
tag docker.container.*
</source>