Merge pull request #1481 from fluent/fix-missing-continuous-line

Fix missing continuous line
fluent · Jan 26, 2024 · 29fdf03 · 29fdf03
2 parents a3e4976 + 7724b85
commit 29fdf03
Show file tree

Hide file tree

Showing 35 changed files with 35 additions and 35 deletions.
diff --git a/docker-image/v1.16/arm64/debian-azureblob/Dockerfile b/docker-image/v1.16/arm64/debian-azureblob/Dockerfile
@@ -35,7 +35,7 @@ RUN buildDeps="sudo make gcc g++ libc-dev libffi-dev" \
     apt-get purge -y --auto-remove \
                   -o APT::AutoRemove::RecommendsImportant=false \
                   $buildDeps \
-                  '*-dev'
+                  '*-dev' \
  && rm -rf /var/lib/apt/lists/* \
     && gem sources --clear-all \
     && rm -rf /tmp/* /var/tmp/* /usr/lib/ruby/gems/*/cache/*.gem

diff --git a/docker-image/v1.16/arm64/debian-cloudwatch/Dockerfile b/docker-image/v1.16/arm64/debian-cloudwatch/Dockerfile
@@ -35,7 +35,7 @@ RUN buildDeps="sudo make gcc g++ libc-dev libffi-dev" \
     apt-get purge -y --auto-remove \
                   -o APT::AutoRemove::RecommendsImportant=false \
                   $buildDeps \
-                  '*-dev'
+                  '*-dev' \
  && rm -rf /var/lib/apt/lists/* \
     && gem sources --clear-all \
     && rm -rf /tmp/* /var/tmp/* /usr/lib/ruby/gems/*/cache/*.gem

diff --git a/docker-image/v1.16/arm64/debian-elasticsearch7/Dockerfile b/docker-image/v1.16/arm64/debian-elasticsearch7/Dockerfile
@@ -35,7 +35,7 @@ RUN buildDeps="sudo make gcc g++ libc-dev libffi-dev" \
     apt-get purge -y --auto-remove \
                   -o APT::AutoRemove::RecommendsImportant=false \
                   $buildDeps \
-                  '*-dev'
+                  '*-dev' \
  && rm -rf /var/lib/apt/lists/* \
     && gem sources --clear-all \
     && rm -rf /tmp/* /var/tmp/* /usr/lib/ruby/gems/*/cache/*.gem

diff --git a/docker-image/v1.16/arm64/debian-elasticsearch8/Dockerfile b/docker-image/v1.16/arm64/debian-elasticsearch8/Dockerfile
@@ -35,7 +35,7 @@ RUN buildDeps="sudo make gcc g++ libc-dev libffi-dev" \
     apt-get purge -y --auto-remove \
                   -o APT::AutoRemove::RecommendsImportant=false \
                   $buildDeps \
-                  '*-dev'
+                  '*-dev' \
  && rm -rf /var/lib/apt/lists/* \
     && gem sources --clear-all \
     && rm -rf /tmp/* /var/tmp/* /usr/lib/ruby/gems/*/cache/*.gem

diff --git a/docker-image/v1.16/arm64/debian-forward/Dockerfile b/docker-image/v1.16/arm64/debian-forward/Dockerfile
@@ -35,7 +35,7 @@ RUN buildDeps="sudo make gcc g++ libc-dev libffi-dev" \
     apt-get purge -y --auto-remove \
                   -o APT::AutoRemove::RecommendsImportant=false \
                   $buildDeps \
-                  '*-dev'
+                  '*-dev' \
  && rm -rf /var/lib/apt/lists/* \
     && gem sources --clear-all \
     && rm -rf /tmp/* /var/tmp/* /usr/lib/ruby/gems/*/cache/*.gem

diff --git a/docker-image/v1.16/arm64/debian-gcs/Dockerfile b/docker-image/v1.16/arm64/debian-gcs/Dockerfile
@@ -35,7 +35,7 @@ RUN buildDeps="sudo make gcc g++ libc-dev libffi-dev" \
     apt-get purge -y --auto-remove \
                   -o APT::AutoRemove::RecommendsImportant=false \
                   $buildDeps \
-                  '*-dev'
+                  '*-dev' \
  && rm -rf /var/lib/apt/lists/* \
     && gem sources --clear-all \
     && rm -rf /tmp/* /var/tmp/* /usr/lib/ruby/gems/*/cache/*.gem

diff --git a/docker-image/v1.16/arm64/debian-graylog/Dockerfile b/docker-image/v1.16/arm64/debian-graylog/Dockerfile
@@ -35,7 +35,7 @@ RUN buildDeps="sudo make gcc g++ libc-dev libffi-dev build-essential patch zlib1
     apt-get purge -y --auto-remove \
                   -o APT::AutoRemove::RecommendsImportant=false \
                   $buildDeps \
-                  '*-dev'
+                  '*-dev' \
  && rm -rf /var/lib/apt/lists/* \
     && gem sources --clear-all \
     && rm -rf /tmp/* /var/tmp/* /usr/lib/ruby/gems/*/cache/*.gem

diff --git a/docker-image/v1.16/arm64/debian-kafka/Dockerfile b/docker-image/v1.16/arm64/debian-kafka/Dockerfile
@@ -35,7 +35,7 @@ RUN buildDeps="sudo make gcc g++ libc-dev libffi-dev build-essential autoconf au
     apt-get purge -y --auto-remove \
                   -o APT::AutoRemove::RecommendsImportant=false \
                   $buildDeps \
-                  '*-dev'
+                  '*-dev' \
  && rm -rf /var/lib/apt/lists/* \
     && gem sources --clear-all \
     && rm -rf /tmp/* /var/tmp/* /usr/lib/ruby/gems/*/cache/*.gem \

diff --git a/docker-image/v1.16/arm64/debian-kafka2/Dockerfile b/docker-image/v1.16/arm64/debian-kafka2/Dockerfile
@@ -35,7 +35,7 @@ RUN buildDeps="sudo make gcc g++ libc-dev libffi-dev build-essential autoconf au
     apt-get purge -y --auto-remove \
                   -o APT::AutoRemove::RecommendsImportant=false \
                   $buildDeps \
-                  '*-dev'
+                  '*-dev' \
  && rm -rf /var/lib/apt/lists/* \
     && gem sources --clear-all \
     && rm -rf /tmp/* /var/tmp/* /usr/lib/ruby/gems/*/cache/*.gem \

diff --git a/docker-image/v1.16/arm64/debian-kinesis/Dockerfile b/docker-image/v1.16/arm64/debian-kinesis/Dockerfile
@@ -35,7 +35,7 @@ RUN buildDeps="sudo make gcc g++ libc-dev libffi-dev" \
     apt-get purge -y --auto-remove \
                   -o APT::AutoRemove::RecommendsImportant=false \
                   $buildDeps \
-                  '*-dev'
+                  '*-dev' \
  && rm -rf /var/lib/apt/lists/* \
     && gem sources --clear-all \
     && rm -rf /tmp/* /var/tmp/* /usr/lib/ruby/gems/*/cache/*.gem

diff --git a/docker-image/v1.16/arm64/debian-logentries/Dockerfile b/docker-image/v1.16/arm64/debian-logentries/Dockerfile
@@ -35,7 +35,7 @@ RUN buildDeps="sudo make gcc g++ libc-dev libffi-dev" \
     apt-get purge -y --auto-remove \
                   -o APT::AutoRemove::RecommendsImportant=false \
                   $buildDeps \
-                  '*-dev'
+                  '*-dev' \
  && rm -rf /var/lib/apt/lists/* \
     && gem sources --clear-all \
     && rm -rf /tmp/* /var/tmp/* /usr/lib/ruby/gems/*/cache/*.gem

diff --git a/docker-image/v1.16/arm64/debian-loggly/Dockerfile b/docker-image/v1.16/arm64/debian-loggly/Dockerfile
@@ -35,7 +35,7 @@ RUN buildDeps="sudo make gcc g++ libc-dev libffi-dev" \
     apt-get purge -y --auto-remove \
                   -o APT::AutoRemove::RecommendsImportant=false \
                   $buildDeps \
-                  '*-dev'
+                  '*-dev' \
  && rm -rf /var/lib/apt/lists/* \
     && gem sources --clear-all \
     && rm -rf /tmp/* /var/tmp/* /usr/lib/ruby/gems/*/cache/*.gem

diff --git a/docker-image/v1.16/arm64/debian-logzio/Dockerfile b/docker-image/v1.16/arm64/debian-logzio/Dockerfile
@@ -35,7 +35,7 @@ RUN buildDeps="sudo make gcc g++ libc-dev libffi-dev" \
     apt-get purge -y --auto-remove \
                   -o APT::AutoRemove::RecommendsImportant=false \
                   $buildDeps \
-                  '*-dev'
+                  '*-dev' \
  && rm -rf /var/lib/apt/lists/* \
     && gem sources --clear-all \
     && rm -rf /tmp/* /var/tmp/* /usr/lib/ruby/gems/*/cache/*.gem

diff --git a/docker-image/v1.16/arm64/debian-opensearch/Dockerfile b/docker-image/v1.16/arm64/debian-opensearch/Dockerfile
@@ -35,7 +35,7 @@ RUN buildDeps="sudo make gcc g++ libc-dev libffi-dev" \
     apt-get purge -y --auto-remove \
                   -o APT::AutoRemove::RecommendsImportant=false \
                   $buildDeps \
-                  '*-dev'
+                  '*-dev' \
  && rm -rf /var/lib/apt/lists/* \
     && gem sources --clear-all \
     && rm -rf /tmp/* /var/tmp/* /usr/lib/ruby/gems/*/cache/*.gem

diff --git a/docker-image/v1.16/arm64/debian-papertrail/Dockerfile b/docker-image/v1.16/arm64/debian-papertrail/Dockerfile
@@ -35,7 +35,7 @@ RUN buildDeps="sudo make gcc g++ libc-dev libffi-dev" \
     apt-get purge -y --auto-remove \
                   -o APT::AutoRemove::RecommendsImportant=false \
                   $buildDeps \
-                  '*-dev'
+                  '*-dev' \
  && rm -rf /var/lib/apt/lists/* \
     && gem sources --clear-all \
     && rm -rf /tmp/* /var/tmp/* /usr/lib/ruby/gems/*/cache/*.gem

diff --git a/docker-image/v1.16/arm64/debian-s3/Dockerfile b/docker-image/v1.16/arm64/debian-s3/Dockerfile
@@ -39,7 +39,7 @@ RUN buildDeps="sudo make gcc g++ libc-dev libffi-dev curl" \
     apt-get purge -y --auto-remove \
                   -o APT::AutoRemove::RecommendsImportant=false \
                   $buildDeps \
-                  '*-dev'
+                  '*-dev' \
  && rm -rf /var/lib/apt/lists/* \
     && gem sources --clear-all \
     && rm -rf /tmp/* /var/tmp/* /usr/lib/ruby/gems/*/cache/*.gem

diff --git a/docker-image/v1.16/arm64/debian-syslog/Dockerfile b/docker-image/v1.16/arm64/debian-syslog/Dockerfile
@@ -35,7 +35,7 @@ RUN buildDeps="sudo make gcc g++ libc-dev libffi-dev" \
     apt-get purge -y --auto-remove \
                   -o APT::AutoRemove::RecommendsImportant=false \
                   $buildDeps \
-                  '*-dev'
+                  '*-dev' \
  && rm -rf /var/lib/apt/lists/* \
     && gem sources --clear-all \
     && rm -rf /tmp/* /var/tmp/* /usr/lib/ruby/gems/*/cache/*.gem

diff --git a/docker-image/v1.16/debian-azureblob/Dockerfile b/docker-image/v1.16/debian-azureblob/Dockerfile
@@ -27,7 +27,7 @@ RUN buildDeps="sudo make gcc g++ libc-dev libffi-dev" \
     apt-get purge -y --auto-remove \
                   -o APT::AutoRemove::RecommendsImportant=false \
                   $buildDeps \
-                  '*-dev'
+                  '*-dev' \
  && rm -rf /var/lib/apt/lists/* \
     && gem sources --clear-all \
     && rm -rf /tmp/* /var/tmp/* /usr/lib/ruby/gems/*/cache/*.gem

diff --git a/docker-image/v1.16/debian-cloudwatch/Dockerfile b/docker-image/v1.16/debian-cloudwatch/Dockerfile
@@ -27,7 +27,7 @@ RUN buildDeps="sudo make gcc g++ libc-dev libffi-dev" \
     apt-get purge -y --auto-remove \
                   -o APT::AutoRemove::RecommendsImportant=false \
                   $buildDeps \
-                  '*-dev'
+                  '*-dev' \
  && rm -rf /var/lib/apt/lists/* \
     && gem sources --clear-all \
     && rm -rf /tmp/* /var/tmp/* /usr/lib/ruby/gems/*/cache/*.gem

diff --git a/docker-image/v1.16/debian-elasticsearch7/Dockerfile b/docker-image/v1.16/debian-elasticsearch7/Dockerfile
@@ -27,7 +27,7 @@ RUN buildDeps="sudo make gcc g++ libc-dev libffi-dev" \
     apt-get purge -y --auto-remove \
                   -o APT::AutoRemove::RecommendsImportant=false \
                   $buildDeps \
-                  '*-dev'
+                  '*-dev' \
  && rm -rf /var/lib/apt/lists/* \
     && gem sources --clear-all \
     && rm -rf /tmp/* /var/tmp/* /usr/lib/ruby/gems/*/cache/*.gem

diff --git a/docker-image/v1.16/debian-elasticsearch8/Dockerfile b/docker-image/v1.16/debian-elasticsearch8/Dockerfile
@@ -27,7 +27,7 @@ RUN buildDeps="sudo make gcc g++ libc-dev libffi-dev" \
     apt-get purge -y --auto-remove \
                   -o APT::AutoRemove::RecommendsImportant=false \
                   $buildDeps \
-                  '*-dev'
+                  '*-dev' \
  && rm -rf /var/lib/apt/lists/* \
     && gem sources --clear-all \
     && rm -rf /tmp/* /var/tmp/* /usr/lib/ruby/gems/*/cache/*.gem

diff --git a/docker-image/v1.16/debian-forward/Dockerfile b/docker-image/v1.16/debian-forward/Dockerfile
@@ -27,7 +27,7 @@ RUN buildDeps="sudo make gcc g++ libc-dev libffi-dev" \
     apt-get purge -y --auto-remove \
                   -o APT::AutoRemove::RecommendsImportant=false \
                   $buildDeps \
-                  '*-dev'
+                  '*-dev' \
  && rm -rf /var/lib/apt/lists/* \
     && gem sources --clear-all \
     && rm -rf /tmp/* /var/tmp/* /usr/lib/ruby/gems/*/cache/*.gem

diff --git a/docker-image/v1.16/debian-gcs/Dockerfile b/docker-image/v1.16/debian-gcs/Dockerfile
@@ -27,7 +27,7 @@ RUN buildDeps="sudo make gcc g++ libc-dev libffi-dev" \
     apt-get purge -y --auto-remove \
                   -o APT::AutoRemove::RecommendsImportant=false \
                   $buildDeps \
-                  '*-dev'
+                  '*-dev' \
  && rm -rf /var/lib/apt/lists/* \
     && gem sources --clear-all \
     && rm -rf /tmp/* /var/tmp/* /usr/lib/ruby/gems/*/cache/*.gem

diff --git a/docker-image/v1.16/debian-graylog/Dockerfile b/docker-image/v1.16/debian-graylog/Dockerfile
@@ -27,7 +27,7 @@ RUN buildDeps="sudo make gcc g++ libc-dev libffi-dev build-essential patch zlib1
     apt-get purge -y --auto-remove \
                   -o APT::AutoRemove::RecommendsImportant=false \
                   $buildDeps \
-                  '*-dev'
+                  '*-dev' \
  && rm -rf /var/lib/apt/lists/* \
     && gem sources --clear-all \
     && rm -rf /tmp/* /var/tmp/* /usr/lib/ruby/gems/*/cache/*.gem

diff --git a/docker-image/v1.16/debian-kafka/Dockerfile b/docker-image/v1.16/debian-kafka/Dockerfile
@@ -27,7 +27,7 @@ RUN buildDeps="sudo make gcc g++ libc-dev libffi-dev build-essential autoconf au
     apt-get purge -y --auto-remove \
                   -o APT::AutoRemove::RecommendsImportant=false \
                   $buildDeps \
-                  '*-dev'
+                  '*-dev' \
  && rm -rf /var/lib/apt/lists/* \
     && gem sources --clear-all \
     && rm -rf /tmp/* /var/tmp/* /usr/lib/ruby/gems/*/cache/*.gem \

diff --git a/docker-image/v1.16/debian-kafka2/Dockerfile b/docker-image/v1.16/debian-kafka2/Dockerfile
@@ -27,7 +27,7 @@ RUN buildDeps="sudo make gcc g++ libc-dev libffi-dev build-essential autoconf au
     apt-get purge -y --auto-remove \
                   -o APT::AutoRemove::RecommendsImportant=false \
                   $buildDeps \
-                  '*-dev'
+                  '*-dev' \
  && rm -rf /var/lib/apt/lists/* \
     && gem sources --clear-all \
     && rm -rf /tmp/* /var/tmp/* /usr/lib/ruby/gems/*/cache/*.gem \

diff --git a/docker-image/v1.16/debian-kinesis/Dockerfile b/docker-image/v1.16/debian-kinesis/Dockerfile
@@ -27,7 +27,7 @@ RUN buildDeps="sudo make gcc g++ libc-dev libffi-dev" \
     apt-get purge -y --auto-remove \
                   -o APT::AutoRemove::RecommendsImportant=false \
                   $buildDeps \
-                  '*-dev'
+                  '*-dev' \
  && rm -rf /var/lib/apt/lists/* \
     && gem sources --clear-all \
     && rm -rf /tmp/* /var/tmp/* /usr/lib/ruby/gems/*/cache/*.gem

diff --git a/docker-image/v1.16/debian-logentries/Dockerfile b/docker-image/v1.16/debian-logentries/Dockerfile
@@ -27,7 +27,7 @@ RUN buildDeps="sudo make gcc g++ libc-dev libffi-dev" \
     apt-get purge -y --auto-remove \
                   -o APT::AutoRemove::RecommendsImportant=false \
                   $buildDeps \
-                  '*-dev'
+                  '*-dev' \
  && rm -rf /var/lib/apt/lists/* \
     && gem sources --clear-all \
     && rm -rf /tmp/* /var/tmp/* /usr/lib/ruby/gems/*/cache/*.gem

diff --git a/docker-image/v1.16/debian-loggly/Dockerfile b/docker-image/v1.16/debian-loggly/Dockerfile
@@ -27,7 +27,7 @@ RUN buildDeps="sudo make gcc g++ libc-dev libffi-dev" \
     apt-get purge -y --auto-remove \
                   -o APT::AutoRemove::RecommendsImportant=false \
                   $buildDeps \
-                  '*-dev'
+                  '*-dev' \
  && rm -rf /var/lib/apt/lists/* \
     && gem sources --clear-all \
     && rm -rf /tmp/* /var/tmp/* /usr/lib/ruby/gems/*/cache/*.gem

diff --git a/docker-image/v1.16/debian-logzio/Dockerfile b/docker-image/v1.16/debian-logzio/Dockerfile
@@ -27,7 +27,7 @@ RUN buildDeps="sudo make gcc g++ libc-dev libffi-dev" \
     apt-get purge -y --auto-remove \
                   -o APT::AutoRemove::RecommendsImportant=false \
                   $buildDeps \
-                  '*-dev'
+                  '*-dev' \
  && rm -rf /var/lib/apt/lists/* \
     && gem sources --clear-all \
     && rm -rf /tmp/* /var/tmp/* /usr/lib/ruby/gems/*/cache/*.gem

diff --git a/docker-image/v1.16/debian-opensearch/Dockerfile b/docker-image/v1.16/debian-opensearch/Dockerfile
@@ -27,7 +27,7 @@ RUN buildDeps="sudo make gcc g++ libc-dev libffi-dev" \
     apt-get purge -y --auto-remove \
                   -o APT::AutoRemove::RecommendsImportant=false \
                   $buildDeps \
-                  '*-dev'
+                  '*-dev' \
  && rm -rf /var/lib/apt/lists/* \
     && gem sources --clear-all \
     && rm -rf /tmp/* /var/tmp/* /usr/lib/ruby/gems/*/cache/*.gem

diff --git a/docker-image/v1.16/debian-papertrail/Dockerfile b/docker-image/v1.16/debian-papertrail/Dockerfile
@@ -27,7 +27,7 @@ RUN buildDeps="sudo make gcc g++ libc-dev libffi-dev" \
     apt-get purge -y --auto-remove \
                   -o APT::AutoRemove::RecommendsImportant=false \
                   $buildDeps \
-                  '*-dev'
+                  '*-dev' \
  && rm -rf /var/lib/apt/lists/* \
     && gem sources --clear-all \
     && rm -rf /tmp/* /var/tmp/* /usr/lib/ruby/gems/*/cache/*.gem

diff --git a/docker-image/v1.16/debian-s3/Dockerfile b/docker-image/v1.16/debian-s3/Dockerfile
@@ -31,7 +31,7 @@ RUN buildDeps="sudo make gcc g++ libc-dev libffi-dev curl" \
     apt-get purge -y --auto-remove \
                   -o APT::AutoRemove::RecommendsImportant=false \
                   $buildDeps \
-                  '*-dev'
+                  '*-dev' \
  && rm -rf /var/lib/apt/lists/* \
     && gem sources --clear-all \
     && rm -rf /tmp/* /var/tmp/* /usr/lib/ruby/gems/*/cache/*.gem

diff --git a/docker-image/v1.16/debian-syslog/Dockerfile b/docker-image/v1.16/debian-syslog/Dockerfile
@@ -27,7 +27,7 @@ RUN buildDeps="sudo make gcc g++ libc-dev libffi-dev" \
     apt-get purge -y --auto-remove \
                   -o APT::AutoRemove::RecommendsImportant=false \
                   $buildDeps \
-                  '*-dev'
+                  '*-dev' \
  && rm -rf /var/lib/apt/lists/* \
     && gem sources --clear-all \
     && rm -rf /tmp/* /var/tmp/* /usr/lib/ruby/gems/*/cache/*.gem

diff --git a/templates/Dockerfile.erb b/templates/Dockerfile.erb
@@ -49,7 +49,7 @@ RUN buildDeps="sudo make gcc g++ libc-dev libffi-dev<% if target == "graylog" %>
     apt-get purge -y --auto-remove \
                   -o APT::AutoRemove::RecommendsImportant=false \
                   $buildDeps \
-                  '*-dev'
+                  '*-dev' \
  && rm -rf /var/lib/apt/lists/* \
     && gem sources --clear-all \
     && rm -rf /tmp/* /var/tmp/* /usr/lib/ruby/gems/*/cache/*.gem<% if target == "kafka" || target == "kafka2" %> \