Update major version of syslog image

Signed-off-by: Masahiro Nakagawa <[email protected]>
fluent · May 7, 2019 · 58c34b5 · 58c34b5
1 parent 8094eac
commit 58c34b5
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/Makefile b/Makefile
@@ -18,7 +18,7 @@ ALL_IMAGES := \
 	v1.3/debian-cloudwatch:v1.3.3-debian-cloudwatch-1.4,v1.3-debian-cloudwatch-1 \
 	v1.3/debian-stackdriver:v1.3.3-debian-stackdriver-1.3,v1.3-debian-stackdriver-1 \
 	v1.3/debian-s3:v1.3.3-debian-s3-1.3,v1.3-debian-s3-1 \
-	v1.3/debian-syslog:v1.3.3-debian-syslog-1.4,v1.3-debian-syslog-1 \
+	v1.3/debian-syslog:v1.3.3-debian-syslog-2.0,v1.3-debian-syslog-2 \
 	v1.3/debian-forward:v1.3.3-debian-forward-1.3,v1.3-debian-forward-1 \
 	v1.3/debian-gcs:v1.3.3-debian-gcs-1.3,v1.3-debian-gcs-1 \
 	v1.3/debian-graylog:v1.3.3-debian-graylog-1.4,v1.3-debian-graylog-1 \

diff --git a/docker-image/v1.3/debian-syslog/conf/fluent.conf b/docker-image/v1.3/debian-syslog/conf/fluent.conf
@@ -16,7 +16,7 @@
   program fluentd
   hostname ${kubernetes_host}
 
-  protocol "#{ENV['SYSLOG_PROTOCOL'] || 'tcp'}" 
+  protocol "#{ENV['SYSLOG_PROTOCOL'] || 'tcp'}"
   tls "#{ENV['SYSLOG_TLS'] || 'false'}"
   ca_file "#{ENV['SYSLOG_CA_FILE'] || ''}"
   verify_mode "#{ENV['SYSLOG_VERIFY_MODE'] || ''}"

diff --git a/docker-image/v1.3/debian-syslog/hooks/post_push b/docker-image/v1.3/debian-syslog/hooks/post_push
@@ -9,7 +9,7 @@ tagStart=$(expr index "$IMAGE_NAME" :)
 repoName=${IMAGE_NAME:0:tagStart-1}
 
 # Tag and push image for each additional tag
-for tag in {v1.3.3-debian-syslog-1.4,v1.3-debian-syslog-1}; do
+for tag in {v1.3.3-debian-syslog-2.0,v1.3-debian-syslog-2}; do
   docker tag $IMAGE_NAME ${repoName}:${tag}
   docker push ${repoName}:${tag}
 done