mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-27 21:47:07 +00:00
Undo pos_file change which does not seem to be working as aspected but keep change to tagging of image.
This commit is contained in:
parent
14d0dbd240
commit
99356d2a65
9
contrib/logging/fluentd-es-image/Makefile
Normal file
9
contrib/logging/fluentd-es-image/Makefile
Normal 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)
|
@ -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 .
|
|
@ -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
|
|
@ -38,7 +38,6 @@
|
|||||||
format json
|
format json
|
||||||
time_key time
|
time_key time
|
||||||
path /var/lib/docker/containers/*/*-json.log
|
path /var/lib/docker/containers/*/*-json.log
|
||||||
pos_file /var/lib/docker/containers/*/*-json.log.pos
|
|
||||||
time_format %Y-%m-%dT%H:%M:%S
|
time_format %Y-%m-%dT%H:%M:%S
|
||||||
tag docker.container.*
|
tag docker.container.*
|
||||||
</source>
|
</source>
|
||||||
|
Loading…
Reference in New Issue
Block a user