-
Notifications
You must be signed in to change notification settings - Fork 354
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #357 from fluent/v1.16.2
v1.16.2
- Loading branch information
Showing
15 changed files
with
55 additions
and
56 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -3,7 +3,7 @@ | |
|
|
||
| FROM alpine:3.17 | ||
| LABEL maintainer "Fluentd developers <[email protected]>" | ||
| LABEL Description="Fluentd docker image" Vendor="Fluent Organization" Version="1.16.1" | ||
| LABEL Description="Fluentd docker image" Vendor="Fluent Organization" Version="1.16.2" | ||
|
|
||
| # Do not split this into multiple RUN! | ||
| # Docker creates a layer for every RUN-Statement | ||
|
|
@@ -17,12 +17,12 @@ RUN apk update \ | |
| build-base linux-headers \ | ||
| ruby-dev gnupg \ | ||
| && echo 'gem: --no-document' >> /etc/gemrc \ | ||
| && gem install oj -v 3.14.3 \ | ||
| && gem install oj -v 3.15.0 \ | ||
| && gem install json -v 2.6.3 \ | ||
| && gem install rexml -v 3.2.5 \ | ||
| && gem install async -v 1.31.0 \ | ||
| && gem install async-http -v 0.60.1 \ | ||
| && gem install fluentd -v 1.16.1 \ | ||
| && gem install async-http -v 0.60.2 \ | ||
| && gem install fluentd -v 1.16.2 \ | ||
| && gem install bigdecimal -v 1.4.4 \ | ||
| && apk del .build-deps \ | ||
| && rm -rf /tmp/* /var/tmp/* /usr/lib/ruby/gems/*/cache/*.gem /usr/lib/ruby/gems/3.*/gems/fluentd-*/test | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -11,7 +11,7 @@ RUN curl -sL -o qemu-6.0.0.balena1-aarch64.tar.gz https://github.com/balena-io/q | |
| FROM arm64v8/ruby:3.1-slim-bullseye | ||
| COPY --from=builder /go/qemu-aarch64-static /usr/bin/ | ||
| LABEL maintainer "Fluentd developers <[email protected]>" | ||
| LABEL Description="Fluentd docker image" Vendor="Fluent Organization" Version="1.16.1" | ||
| LABEL Description="Fluentd docker image" Vendor="Fluent Organization" Version="1.16.2" | ||
| ARG CROSS_BUILD_START="cross-build-start" | ||
| ARG CROSS_BUILD_END="cross-build-end" | ||
| RUN [ ${CROSS_BUILD_START} ] | ||
|
|
@@ -29,12 +29,12 @@ RUN apt-get update \ | |
| " \ | ||
| && apt-get install -y --no-install-recommends $buildDeps \ | ||
| && echo 'gem: --no-document' >> /etc/gemrc \ | ||
| && gem install oj -v 3.14.3 \ | ||
| && gem install oj -v 3.15.0 \ | ||
| && gem install json -v 2.6.3 \ | ||
| && gem install rexml -v 3.2.5 \ | ||
| && gem install async -v 1.31.0 \ | ||
| && gem install async-http -v 0.60.1 \ | ||
| && gem install fluentd -v 1.16.1 \ | ||
| && gem install async-http -v 0.60.2 \ | ||
| && gem install fluentd -v 1.16.2 \ | ||
| && dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')" \ | ||
| && wget -O /usr/local/bin/tini "https://github.com/krallin/tini/releases/download/v$TINI_VERSION/tini-$dpkgArch" \ | ||
| && wget -O /usr/local/bin/tini.asc "https://github.com/krallin/tini/releases/download/v$TINI_VERSION/tini-$dpkgArch.asc" \ | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -11,7 +11,7 @@ RUN curl -sL -o qemu-3.0.0+resin-arm.tar.gz https://github.com/balena-io/qemu/re | |
| FROM arm32v7/ruby:3.1-slim-bullseye | ||
| COPY --from=builder /go/qemu-arm-static /usr/bin/ | ||
| LABEL maintainer "Fluentd developers <[email protected]>" | ||
| LABEL Description="Fluentd docker image" Vendor="Fluent Organization" Version="1.16.1" | ||
| LABEL Description="Fluentd docker image" Vendor="Fluent Organization" Version="1.16.2" | ||
| ARG CROSS_BUILD_START="cross-build-start" | ||
| ARG CROSS_BUILD_END="cross-build-end" | ||
| RUN [ ${CROSS_BUILD_START} ] | ||
|
|
@@ -29,12 +29,12 @@ RUN apt-get update \ | |
| " \ | ||
| && apt-get install -y --no-install-recommends $buildDeps \ | ||
| && echo 'gem: --no-document' >> /etc/gemrc \ | ||
| && gem install oj -v 3.14.3 \ | ||
| && gem install oj -v 3.15.0 \ | ||
| && gem install json -v 2.6.3 \ | ||
| && gem install rexml -v 3.2.5 \ | ||
| && gem install async -v 1.31.0 \ | ||
| && gem install async-http -v 0.60.1 \ | ||
| && gem install fluentd -v 1.16.1 \ | ||
| && gem install async-http -v 0.60.2 \ | ||
| && gem install fluentd -v 1.16.2 \ | ||
| && dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')" \ | ||
| && wget -O /usr/local/bin/tini "https://github.com/krallin/tini/releases/download/v$TINI_VERSION/tini-$dpkgArch" \ | ||
| && wget -O /usr/local/bin/tini.asc "https://github.com/krallin/tini/releases/download/v$TINI_VERSION/tini-$dpkgArch.asc" \ | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -3,7 +3,7 @@ | |
|
|
||
| FROM ruby:3.1-slim-bullseye | ||
| LABEL maintainer "Fluentd developers <[email protected]>" | ||
| LABEL Description="Fluentd docker image" Vendor="Fluent Organization" Version="1.16.1" | ||
| LABEL Description="Fluentd docker image" Vendor="Fluent Organization" Version="1.16.2" | ||
| ENV TINI_VERSION=0.18.0 | ||
|
|
||
| # Do not split this into multiple RUN! | ||
|
|
@@ -18,12 +18,12 @@ RUN apt-get update \ | |
| " \ | ||
| && apt-get install -y --no-install-recommends $buildDeps \ | ||
| && echo 'gem: --no-document' >> /etc/gemrc \ | ||
| && gem install oj -v 3.14.3 \ | ||
| && gem install oj -v 3.15.0 \ | ||
| && gem install json -v 2.6.3 \ | ||
| && gem install rexml -v 3.2.5 \ | ||
| && gem install async -v 1.31.0 \ | ||
| && gem install async-http -v 0.60.1 \ | ||
| && gem install fluentd -v 1.16.1 \ | ||
| && gem install async-http -v 0.60.2 \ | ||
| && gem install fluentd -v 1.16.2 \ | ||
| && dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')" \ | ||
| && wget -O /usr/local/bin/tini "https://github.com/krallin/tini/releases/download/v$TINI_VERSION/tini-$dpkgArch" \ | ||
| && wget -O /usr/local/bin/tini.asc "https://github.com/krallin/tini/releases/download/v$TINI_VERSION/tini-$dpkgArch.asc" \ | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -3,7 +3,7 @@ | |
|
|
||
| FROM mcr.microsoft.com/windows/servercore:ltsc2019 | ||
| LABEL maintainer "Fluentd developers <[email protected]>" | ||
| LABEL Description="Fluentd docker image" Vendor="Fluent Organization" Version="1.16.1" | ||
| LABEL Description="Fluentd docker image" Vendor="Fluent Organization" Version="1.16.2" | ||
|
|
||
| # Do not split this into multiple RUN! | ||
| # Docker creates a layer for every RUN-Statement | ||
|
|
@@ -15,10 +15,10 @@ RUN choco install -y ruby --version 3.1.3.1 --params "'/InstallDir:C:\ruby31'" \ | |
| RUN refreshenv \ | ||
| && ridk install 3 \ | ||
| && echo gem: --no-document >> C:\ProgramData\gemrc \ | ||
| && gem install oj -v 3.14.2 \ | ||
| && gem install oj -v 3.15.0 \ | ||
| && gem install json -v 2.6.3 \ | ||
| && gem install rexml -v 3.2.5 \ | ||
| && gem install fluentd -v 1.16.1 \ | ||
| && gem install fluentd -v 1.16.2 \ | ||
| && gem install win32-service -v 2.3.2 \ | ||
| && gem install win32-ipc -v 0.7.0 \ | ||
| && gem install win32-event -v 0.6.3 \ | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -3,7 +3,7 @@ | |
|
|
||
| FROM mcr.microsoft.com/windows/servercore:ltsc2022 | ||
| LABEL maintainer "Fluentd developers <[email protected]>" | ||
| LABEL Description="Fluentd docker image" Vendor="Fluent Organization" Version="1.16.1" | ||
| LABEL Description="Fluentd docker image" Vendor="Fluent Organization" Version="1.16.2" | ||
|
|
||
| # Do not split this into multiple RUN! | ||
| # Docker creates a layer for every RUN-Statement | ||
|
|
@@ -15,10 +15,10 @@ RUN choco install -y ruby --version 3.1.3.1 --params "'/InstallDir:C:\ruby31'" \ | |
| RUN refreshenv \ | ||
| && ridk install 3 \ | ||
| && echo gem: --no-document >> C:\ProgramData\gemrc \ | ||
| && gem install oj -v 3.14.2 \ | ||
| && gem install oj -v 3.15.0 \ | ||
| && gem install json -v 2.6.3 \ | ||
| && gem install rexml -v 3.2.5 \ | ||
| && gem install fluentd -v 1.16.1 \ | ||
| && gem install fluentd -v 1.16.2 \ | ||
| && gem install win32-service -v 2.3.2 \ | ||
| && gem install win32-ipc -v 0.7.0 \ | ||
| && gem install win32-event -v 0.6.3 \ | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters