Skip to content

Commit

Permalink
Merge pull request #1414 from fluent/v1.15.3-1.1-revised
Browse files Browse the repository at this point in the history
Fix wrong docker tag for base fluentd image
  • Loading branch information
ashie committed Feb 14, 2023
2 parents f0245a0 + c339931 commit d624543
Show file tree
Hide file tree
Showing 37 changed files with 38 additions and 38 deletions.
2 changes: 1 addition & 1 deletion docker-image/v1.15/arm64/debian-azureblob/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ ENV QEMU_DOWNLOAD_SHA256 5db25cccb40ac7b1ca857653b883376b931d91b06ff34ffe70dcf61
RUN apk add curl --no-cache
RUN curl -sL -o qemu-6.0.0.balena1-aarch64.tar.gz https://github.com/balena-io/qemu/releases/download/v6.0.0%2Bbalena1/qemu-6.0.0.balena1-aarch64.tar.gz && echo "$QEMU_DOWNLOAD_SHA256 *qemu-6.0.0.balena1-aarch64.tar.gz" | sha256sum -c - | tar zxvf qemu-6.0.0.balena1-aarch64.tar.gz -C . && mv qemu-6.0.0+balena1-aarch64/qemu-aarch64-static .

FROM fluent/fluentd:v1.15.3-debian-arm64-1
FROM fluent/fluentd:v1.15.3-debian-arm64-1.2
COPY --from=builder /go/qemu-aarch64-static /usr/bin/

LABEL maintainer="Eduardo Silva <eduardo@treasure-data.com>"
Expand Down
2 changes: 1 addition & 1 deletion docker-image/v1.15/arm64/debian-cloudwatch/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ ENV QEMU_DOWNLOAD_SHA256 5db25cccb40ac7b1ca857653b883376b931d91b06ff34ffe70dcf61
RUN apk add curl --no-cache
RUN curl -sL -o qemu-6.0.0.balena1-aarch64.tar.gz https://github.com/balena-io/qemu/releases/download/v6.0.0%2Bbalena1/qemu-6.0.0.balena1-aarch64.tar.gz && echo "$QEMU_DOWNLOAD_SHA256 *qemu-6.0.0.balena1-aarch64.tar.gz" | sha256sum -c - | tar zxvf qemu-6.0.0.balena1-aarch64.tar.gz -C . && mv qemu-6.0.0+balena1-aarch64/qemu-aarch64-static .

FROM fluent/fluentd:v1.15.3-debian-arm64-1
FROM fluent/fluentd:v1.15.3-debian-arm64-1.2
COPY --from=builder /go/qemu-aarch64-static /usr/bin/

LABEL maintainer="Eduardo Silva <eduardo@treasure-data.com>"
Expand Down
2 changes: 1 addition & 1 deletion docker-image/v1.15/arm64/debian-elasticsearch6/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ ENV QEMU_DOWNLOAD_SHA256 5db25cccb40ac7b1ca857653b883376b931d91b06ff34ffe70dcf61
RUN apk add curl --no-cache
RUN curl -sL -o qemu-6.0.0.balena1-aarch64.tar.gz https://github.com/balena-io/qemu/releases/download/v6.0.0%2Bbalena1/qemu-6.0.0.balena1-aarch64.tar.gz && echo "$QEMU_DOWNLOAD_SHA256 *qemu-6.0.0.balena1-aarch64.tar.gz" | sha256sum -c - | tar zxvf qemu-6.0.0.balena1-aarch64.tar.gz -C . && mv qemu-6.0.0+balena1-aarch64/qemu-aarch64-static .

FROM fluent/fluentd:v1.15.3-debian-arm64-1
FROM fluent/fluentd:v1.15.3-debian-arm64-1.2
COPY --from=builder /go/qemu-aarch64-static /usr/bin/

LABEL maintainer="Eduardo Silva <eduardo@treasure-data.com>"
Expand Down
2 changes: 1 addition & 1 deletion docker-image/v1.15/arm64/debian-elasticsearch7/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ ENV QEMU_DOWNLOAD_SHA256 5db25cccb40ac7b1ca857653b883376b931d91b06ff34ffe70dcf61
RUN apk add curl --no-cache
RUN curl -sL -o qemu-6.0.0.balena1-aarch64.tar.gz https://github.com/balena-io/qemu/releases/download/v6.0.0%2Bbalena1/qemu-6.0.0.balena1-aarch64.tar.gz && echo "$QEMU_DOWNLOAD_SHA256 *qemu-6.0.0.balena1-aarch64.tar.gz" | sha256sum -c - | tar zxvf qemu-6.0.0.balena1-aarch64.tar.gz -C . && mv qemu-6.0.0+balena1-aarch64/qemu-aarch64-static .

FROM fluent/fluentd:v1.15.3-debian-arm64-1
FROM fluent/fluentd:v1.15.3-debian-arm64-1.2
COPY --from=builder /go/qemu-aarch64-static /usr/bin/

LABEL maintainer="Eduardo Silva <eduardo@treasure-data.com>"
Expand Down
2 changes: 1 addition & 1 deletion docker-image/v1.15/arm64/debian-forward/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ ENV QEMU_DOWNLOAD_SHA256 5db25cccb40ac7b1ca857653b883376b931d91b06ff34ffe70dcf61
RUN apk add curl --no-cache
RUN curl -sL -o qemu-6.0.0.balena1-aarch64.tar.gz https://github.com/balena-io/qemu/releases/download/v6.0.0%2Bbalena1/qemu-6.0.0.balena1-aarch64.tar.gz && echo "$QEMU_DOWNLOAD_SHA256 *qemu-6.0.0.balena1-aarch64.tar.gz" | sha256sum -c - | tar zxvf qemu-6.0.0.balena1-aarch64.tar.gz -C . && mv qemu-6.0.0+balena1-aarch64/qemu-aarch64-static .

FROM fluent/fluentd:v1.15.3-debian-arm64-1
FROM fluent/fluentd:v1.15.3-debian-arm64-1.2
COPY --from=builder /go/qemu-aarch64-static /usr/bin/

LABEL maintainer="Eduardo Silva <eduardo@treasure-data.com>"
Expand Down
2 changes: 1 addition & 1 deletion docker-image/v1.15/arm64/debian-gcs/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ ENV QEMU_DOWNLOAD_SHA256 5db25cccb40ac7b1ca857653b883376b931d91b06ff34ffe70dcf61
RUN apk add curl --no-cache
RUN curl -sL -o qemu-6.0.0.balena1-aarch64.tar.gz https://github.com/balena-io/qemu/releases/download/v6.0.0%2Bbalena1/qemu-6.0.0.balena1-aarch64.tar.gz && echo "$QEMU_DOWNLOAD_SHA256 *qemu-6.0.0.balena1-aarch64.tar.gz" | sha256sum -c - | tar zxvf qemu-6.0.0.balena1-aarch64.tar.gz -C . && mv qemu-6.0.0+balena1-aarch64/qemu-aarch64-static .

FROM fluent/fluentd:v1.15.3-debian-arm64-1
FROM fluent/fluentd:v1.15.3-debian-arm64-1.2
COPY --from=builder /go/qemu-aarch64-static /usr/bin/

LABEL maintainer="Eduardo Silva <eduardo@treasure-data.com>"
Expand Down
2 changes: 1 addition & 1 deletion docker-image/v1.15/arm64/debian-graylog/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ ENV QEMU_DOWNLOAD_SHA256 5db25cccb40ac7b1ca857653b883376b931d91b06ff34ffe70dcf61
RUN apk add curl --no-cache
RUN curl -sL -o qemu-6.0.0.balena1-aarch64.tar.gz https://github.com/balena-io/qemu/releases/download/v6.0.0%2Bbalena1/qemu-6.0.0.balena1-aarch64.tar.gz && echo "$QEMU_DOWNLOAD_SHA256 *qemu-6.0.0.balena1-aarch64.tar.gz" | sha256sum -c - | tar zxvf qemu-6.0.0.balena1-aarch64.tar.gz -C . && mv qemu-6.0.0+balena1-aarch64/qemu-aarch64-static .

FROM fluent/fluentd:v1.15.3-debian-arm64-1
FROM fluent/fluentd:v1.15.3-debian-arm64-1.2
COPY --from=builder /go/qemu-aarch64-static /usr/bin/

LABEL maintainer="Eduardo Silva <eduardo@treasure-data.com>"
Expand Down
2 changes: 1 addition & 1 deletion docker-image/v1.15/arm64/debian-kafka/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ ENV QEMU_DOWNLOAD_SHA256 5db25cccb40ac7b1ca857653b883376b931d91b06ff34ffe70dcf61
RUN apk add curl --no-cache
RUN curl -sL -o qemu-6.0.0.balena1-aarch64.tar.gz https://github.com/balena-io/qemu/releases/download/v6.0.0%2Bbalena1/qemu-6.0.0.balena1-aarch64.tar.gz && echo "$QEMU_DOWNLOAD_SHA256 *qemu-6.0.0.balena1-aarch64.tar.gz" | sha256sum -c - | tar zxvf qemu-6.0.0.balena1-aarch64.tar.gz -C . && mv qemu-6.0.0+balena1-aarch64/qemu-aarch64-static .

FROM fluent/fluentd:v1.15.3-debian-arm64-1
FROM fluent/fluentd:v1.15.3-debian-arm64-1.2
COPY --from=builder /go/qemu-aarch64-static /usr/bin/

LABEL maintainer="Eduardo Silva <eduardo@treasure-data.com>"
Expand Down
2 changes: 1 addition & 1 deletion docker-image/v1.15/arm64/debian-kafka2/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ ENV QEMU_DOWNLOAD_SHA256 5db25cccb40ac7b1ca857653b883376b931d91b06ff34ffe70dcf61
RUN apk add curl --no-cache
RUN curl -sL -o qemu-6.0.0.balena1-aarch64.tar.gz https://github.com/balena-io/qemu/releases/download/v6.0.0%2Bbalena1/qemu-6.0.0.balena1-aarch64.tar.gz && echo "$QEMU_DOWNLOAD_SHA256 *qemu-6.0.0.balena1-aarch64.tar.gz" | sha256sum -c - | tar zxvf qemu-6.0.0.balena1-aarch64.tar.gz -C . && mv qemu-6.0.0+balena1-aarch64/qemu-aarch64-static .

FROM fluent/fluentd:v1.15.3-debian-arm64-1
FROM fluent/fluentd:v1.15.3-debian-arm64-1.2
COPY --from=builder /go/qemu-aarch64-static /usr/bin/

LABEL maintainer="Eduardo Silva <eduardo@treasure-data.com>"
Expand Down
2 changes: 1 addition & 1 deletion docker-image/v1.15/arm64/debian-kinesis/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ ENV QEMU_DOWNLOAD_SHA256 5db25cccb40ac7b1ca857653b883376b931d91b06ff34ffe70dcf61
RUN apk add curl --no-cache
RUN curl -sL -o qemu-6.0.0.balena1-aarch64.tar.gz https://github.com/balena-io/qemu/releases/download/v6.0.0%2Bbalena1/qemu-6.0.0.balena1-aarch64.tar.gz && echo "$QEMU_DOWNLOAD_SHA256 *qemu-6.0.0.balena1-aarch64.tar.gz" | sha256sum -c - | tar zxvf qemu-6.0.0.balena1-aarch64.tar.gz -C . && mv qemu-6.0.0+balena1-aarch64/qemu-aarch64-static .

FROM fluent/fluentd:v1.15.3-debian-arm64-1
FROM fluent/fluentd:v1.15.3-debian-arm64-1.2
COPY --from=builder /go/qemu-aarch64-static /usr/bin/

LABEL maintainer="Eduardo Silva <eduardo@treasure-data.com>"
Expand Down
2 changes: 1 addition & 1 deletion docker-image/v1.15/arm64/debian-logentries/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ ENV QEMU_DOWNLOAD_SHA256 5db25cccb40ac7b1ca857653b883376b931d91b06ff34ffe70dcf61
RUN apk add curl --no-cache
RUN curl -sL -o qemu-6.0.0.balena1-aarch64.tar.gz https://github.com/balena-io/qemu/releases/download/v6.0.0%2Bbalena1/qemu-6.0.0.balena1-aarch64.tar.gz && echo "$QEMU_DOWNLOAD_SHA256 *qemu-6.0.0.balena1-aarch64.tar.gz" | sha256sum -c - | tar zxvf qemu-6.0.0.balena1-aarch64.tar.gz -C . && mv qemu-6.0.0+balena1-aarch64/qemu-aarch64-static .

FROM fluent/fluentd:v1.15.3-debian-arm64-1
FROM fluent/fluentd:v1.15.3-debian-arm64-1.2
COPY --from=builder /go/qemu-aarch64-static /usr/bin/

LABEL maintainer="Eduardo Silva <eduardo@treasure-data.com>"
Expand Down
2 changes: 1 addition & 1 deletion docker-image/v1.15/arm64/debian-loggly/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ ENV QEMU_DOWNLOAD_SHA256 5db25cccb40ac7b1ca857653b883376b931d91b06ff34ffe70dcf61
RUN apk add curl --no-cache
RUN curl -sL -o qemu-6.0.0.balena1-aarch64.tar.gz https://github.com/balena-io/qemu/releases/download/v6.0.0%2Bbalena1/qemu-6.0.0.balena1-aarch64.tar.gz && echo "$QEMU_DOWNLOAD_SHA256 *qemu-6.0.0.balena1-aarch64.tar.gz" | sha256sum -c - | tar zxvf qemu-6.0.0.balena1-aarch64.tar.gz -C . && mv qemu-6.0.0+balena1-aarch64/qemu-aarch64-static .

FROM fluent/fluentd:v1.15.3-debian-arm64-1
FROM fluent/fluentd:v1.15.3-debian-arm64-1.2
COPY --from=builder /go/qemu-aarch64-static /usr/bin/

LABEL maintainer="Eduardo Silva <eduardo@treasure-data.com>"
Expand Down
2 changes: 1 addition & 1 deletion docker-image/v1.15/arm64/debian-logzio/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ ENV QEMU_DOWNLOAD_SHA256 5db25cccb40ac7b1ca857653b883376b931d91b06ff34ffe70dcf61
RUN apk add curl --no-cache
RUN curl -sL -o qemu-6.0.0.balena1-aarch64.tar.gz https://github.com/balena-io/qemu/releases/download/v6.0.0%2Bbalena1/qemu-6.0.0.balena1-aarch64.tar.gz && echo "$QEMU_DOWNLOAD_SHA256 *qemu-6.0.0.balena1-aarch64.tar.gz" | sha256sum -c - | tar zxvf qemu-6.0.0.balena1-aarch64.tar.gz -C . && mv qemu-6.0.0+balena1-aarch64/qemu-aarch64-static .

FROM fluent/fluentd:v1.15.3-debian-arm64-1
FROM fluent/fluentd:v1.15.3-debian-arm64-1.2
COPY --from=builder /go/qemu-aarch64-static /usr/bin/

LABEL maintainer="Eduardo Silva <eduardo@treasure-data.com>"
Expand Down
2 changes: 1 addition & 1 deletion docker-image/v1.15/arm64/debian-opensearch/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ ENV QEMU_DOWNLOAD_SHA256 5db25cccb40ac7b1ca857653b883376b931d91b06ff34ffe70dcf61
RUN apk add curl --no-cache
RUN curl -sL -o qemu-6.0.0.balena1-aarch64.tar.gz https://github.com/balena-io/qemu/releases/download/v6.0.0%2Bbalena1/qemu-6.0.0.balena1-aarch64.tar.gz && echo "$QEMU_DOWNLOAD_SHA256 *qemu-6.0.0.balena1-aarch64.tar.gz" | sha256sum -c - | tar zxvf qemu-6.0.0.balena1-aarch64.tar.gz -C . && mv qemu-6.0.0+balena1-aarch64/qemu-aarch64-static .

FROM fluent/fluentd:v1.15.3-debian-arm64-1
FROM fluent/fluentd:v1.15.3-debian-arm64-1.2
COPY --from=builder /go/qemu-aarch64-static /usr/bin/

LABEL maintainer="Eduardo Silva <eduardo@treasure-data.com>"
Expand Down
2 changes: 1 addition & 1 deletion docker-image/v1.15/arm64/debian-papertrail/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ ENV QEMU_DOWNLOAD_SHA256 5db25cccb40ac7b1ca857653b883376b931d91b06ff34ffe70dcf61
RUN apk add curl --no-cache
RUN curl -sL -o qemu-6.0.0.balena1-aarch64.tar.gz https://github.com/balena-io/qemu/releases/download/v6.0.0%2Bbalena1/qemu-6.0.0.balena1-aarch64.tar.gz && echo "$QEMU_DOWNLOAD_SHA256 *qemu-6.0.0.balena1-aarch64.tar.gz" | sha256sum -c - | tar zxvf qemu-6.0.0.balena1-aarch64.tar.gz -C . && mv qemu-6.0.0+balena1-aarch64/qemu-aarch64-static .

FROM fluent/fluentd:v1.15.3-debian-arm64-1
FROM fluent/fluentd:v1.15.3-debian-arm64-1.2
COPY --from=builder /go/qemu-aarch64-static /usr/bin/

LABEL maintainer="Eduardo Silva <eduardo@treasure-data.com>"
Expand Down
2 changes: 1 addition & 1 deletion docker-image/v1.15/arm64/debian-s3/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ ENV QEMU_DOWNLOAD_SHA256 5db25cccb40ac7b1ca857653b883376b931d91b06ff34ffe70dcf61
RUN apk add curl --no-cache
RUN curl -sL -o qemu-6.0.0.balena1-aarch64.tar.gz https://github.com/balena-io/qemu/releases/download/v6.0.0%2Bbalena1/qemu-6.0.0.balena1-aarch64.tar.gz && echo "$QEMU_DOWNLOAD_SHA256 *qemu-6.0.0.balena1-aarch64.tar.gz" | sha256sum -c - | tar zxvf qemu-6.0.0.balena1-aarch64.tar.gz -C . && mv qemu-6.0.0+balena1-aarch64/qemu-aarch64-static .

FROM fluent/fluentd:v1.15.3-debian-arm64-1
FROM fluent/fluentd:v1.15.3-debian-arm64-1.2
COPY --from=builder /go/qemu-aarch64-static /usr/bin/

LABEL maintainer="Eduardo Silva <eduardo@treasure-data.com>"
Expand Down
2 changes: 1 addition & 1 deletion docker-image/v1.15/arm64/debian-stackdriver/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ ENV QEMU_DOWNLOAD_SHA256 5db25cccb40ac7b1ca857653b883376b931d91b06ff34ffe70dcf61
RUN apk add curl --no-cache
RUN curl -sL -o qemu-6.0.0.balena1-aarch64.tar.gz https://github.com/balena-io/qemu/releases/download/v6.0.0%2Bbalena1/qemu-6.0.0.balena1-aarch64.tar.gz && echo "$QEMU_DOWNLOAD_SHA256 *qemu-6.0.0.balena1-aarch64.tar.gz" | sha256sum -c - | tar zxvf qemu-6.0.0.balena1-aarch64.tar.gz -C . && mv qemu-6.0.0+balena1-aarch64/qemu-aarch64-static .

FROM fluent/fluentd:v1.15.3-debian-arm64-1
FROM fluent/fluentd:v1.15.3-debian-arm64-1.2
COPY --from=builder /go/qemu-aarch64-static /usr/bin/

LABEL maintainer="Eduardo Silva <eduardo@treasure-data.com>"
Expand Down
2 changes: 1 addition & 1 deletion docker-image/v1.15/arm64/debian-syslog/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ ENV QEMU_DOWNLOAD_SHA256 5db25cccb40ac7b1ca857653b883376b931d91b06ff34ffe70dcf61
RUN apk add curl --no-cache
RUN curl -sL -o qemu-6.0.0.balena1-aarch64.tar.gz https://github.com/balena-io/qemu/releases/download/v6.0.0%2Bbalena1/qemu-6.0.0.balena1-aarch64.tar.gz && echo "$QEMU_DOWNLOAD_SHA256 *qemu-6.0.0.balena1-aarch64.tar.gz" | sha256sum -c - | tar zxvf qemu-6.0.0.balena1-aarch64.tar.gz -C . && mv qemu-6.0.0+balena1-aarch64/qemu-aarch64-static .

FROM fluent/fluentd:v1.15.3-debian-arm64-1
FROM fluent/fluentd:v1.15.3-debian-arm64-1.2
COPY --from=builder /go/qemu-aarch64-static /usr/bin/

LABEL maintainer="Eduardo Silva <eduardo@treasure-data.com>"
Expand Down
2 changes: 1 addition & 1 deletion docker-image/v1.15/debian-azureblob/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# AUTOMATICALLY GENERATED
# DO NOT EDIT THIS FILE DIRECTLY, USE /templates/Dockerfile.erb

FROM fluent/fluentd:v1.15.3-debian-amd64-1
FROM fluent/fluentd:v1.15.3-debian-amd64-1.2

LABEL maintainer="Eduardo Silva <eduardo@treasure-data.com>"
USER root
Expand Down
2 changes: 1 addition & 1 deletion docker-image/v1.15/debian-cloudwatch/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# AUTOMATICALLY GENERATED
# DO NOT EDIT THIS FILE DIRECTLY, USE /templates/Dockerfile.erb

FROM fluent/fluentd:v1.15.3-debian-amd64-1
FROM fluent/fluentd:v1.15.3-debian-amd64-1.2

LABEL maintainer="Eduardo Silva <eduardo@treasure-data.com>"
USER root
Expand Down
2 changes: 1 addition & 1 deletion docker-image/v1.15/debian-elasticsearch6/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# AUTOMATICALLY GENERATED
# DO NOT EDIT THIS FILE DIRECTLY, USE /templates/Dockerfile.erb

FROM fluent/fluentd:v1.15.3-debian-amd64-1
FROM fluent/fluentd:v1.15.3-debian-amd64-1.2

LABEL maintainer="Eduardo Silva <eduardo@treasure-data.com>"
USER root
Expand Down
2 changes: 1 addition & 1 deletion docker-image/v1.15/debian-elasticsearch7/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# AUTOMATICALLY GENERATED
# DO NOT EDIT THIS FILE DIRECTLY, USE /templates/Dockerfile.erb

FROM fluent/fluentd:v1.15.3-debian-amd64-1
FROM fluent/fluentd:v1.15.3-debian-amd64-1.2

LABEL maintainer="Eduardo Silva <eduardo@treasure-data.com>"
USER root
Expand Down
2 changes: 1 addition & 1 deletion docker-image/v1.15/debian-forward/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# AUTOMATICALLY GENERATED
# DO NOT EDIT THIS FILE DIRECTLY, USE /templates/Dockerfile.erb

FROM fluent/fluentd:v1.15.3-debian-amd64-1
FROM fluent/fluentd:v1.15.3-debian-amd64-1.2

LABEL maintainer="Eduardo Silva <eduardo@treasure-data.com>"
USER root
Expand Down
2 changes: 1 addition & 1 deletion docker-image/v1.15/debian-gcs/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# AUTOMATICALLY GENERATED
# DO NOT EDIT THIS FILE DIRECTLY, USE /templates/Dockerfile.erb

FROM fluent/fluentd:v1.15.3-debian-amd64-1
FROM fluent/fluentd:v1.15.3-debian-amd64-1.2

LABEL maintainer="Eduardo Silva <eduardo@treasure-data.com>"
USER root
Expand Down
2 changes: 1 addition & 1 deletion docker-image/v1.15/debian-graylog/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# AUTOMATICALLY GENERATED
# DO NOT EDIT THIS FILE DIRECTLY, USE /templates/Dockerfile.erb

FROM fluent/fluentd:v1.15.3-debian-amd64-1
FROM fluent/fluentd:v1.15.3-debian-amd64-1.2

LABEL maintainer="Eduardo Silva <eduardo@treasure-data.com>"
USER root
Expand Down
2 changes: 1 addition & 1 deletion docker-image/v1.15/debian-kafka/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# AUTOMATICALLY GENERATED
# DO NOT EDIT THIS FILE DIRECTLY, USE /templates/Dockerfile.erb

FROM fluent/fluentd:v1.15.3-debian-amd64-1
FROM fluent/fluentd:v1.15.3-debian-amd64-1.2

LABEL maintainer="Eduardo Silva <eduardo@treasure-data.com>"
USER root
Expand Down
2 changes: 1 addition & 1 deletion docker-image/v1.15/debian-kafka2/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# AUTOMATICALLY GENERATED
# DO NOT EDIT THIS FILE DIRECTLY, USE /templates/Dockerfile.erb

FROM fluent/fluentd:v1.15.3-debian-amd64-1
FROM fluent/fluentd:v1.15.3-debian-amd64-1.2

LABEL maintainer="Eduardo Silva <eduardo@treasure-data.com>"
USER root
Expand Down
2 changes: 1 addition & 1 deletion docker-image/v1.15/debian-kinesis/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# AUTOMATICALLY GENERATED
# DO NOT EDIT THIS FILE DIRECTLY, USE /templates/Dockerfile.erb

FROM fluent/fluentd:v1.15.3-debian-amd64-1
FROM fluent/fluentd:v1.15.3-debian-amd64-1.2

LABEL maintainer="Eduardo Silva <eduardo@treasure-data.com>"
USER root
Expand Down
2 changes: 1 addition & 1 deletion docker-image/v1.15/debian-logentries/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# AUTOMATICALLY GENERATED
# DO NOT EDIT THIS FILE DIRECTLY, USE /templates/Dockerfile.erb

FROM fluent/fluentd:v1.15.3-debian-amd64-1
FROM fluent/fluentd:v1.15.3-debian-amd64-1.2

LABEL maintainer="Eduardo Silva <eduardo@treasure-data.com>"
USER root
Expand Down
2 changes: 1 addition & 1 deletion docker-image/v1.15/debian-loggly/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# AUTOMATICALLY GENERATED
# DO NOT EDIT THIS FILE DIRECTLY, USE /templates/Dockerfile.erb

FROM fluent/fluentd:v1.15.3-debian-amd64-1
FROM fluent/fluentd:v1.15.3-debian-amd64-1.2

LABEL maintainer="Eduardo Silva <eduardo@treasure-data.com>"
USER root
Expand Down
2 changes: 1 addition & 1 deletion docker-image/v1.15/debian-logzio/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# AUTOMATICALLY GENERATED
# DO NOT EDIT THIS FILE DIRECTLY, USE /templates/Dockerfile.erb

FROM fluent/fluentd:v1.15.3-debian-amd64-1
FROM fluent/fluentd:v1.15.3-debian-amd64-1.2

LABEL maintainer="Eduardo Silva <eduardo@treasure-data.com>"
USER root
Expand Down
2 changes: 1 addition & 1 deletion docker-image/v1.15/debian-opensearch/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# AUTOMATICALLY GENERATED
# DO NOT EDIT THIS FILE DIRECTLY, USE /templates/Dockerfile.erb

FROM fluent/fluentd:v1.15.3-debian-amd64-1
FROM fluent/fluentd:v1.15.3-debian-amd64-1.2

LABEL maintainer="Eduardo Silva <eduardo@treasure-data.com>"
USER root
Expand Down
2 changes: 1 addition & 1 deletion docker-image/v1.15/debian-papertrail/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# AUTOMATICALLY GENERATED
# DO NOT EDIT THIS FILE DIRECTLY, USE /templates/Dockerfile.erb

FROM fluent/fluentd:v1.15.3-debian-amd64-1
FROM fluent/fluentd:v1.15.3-debian-amd64-1.2

LABEL maintainer="Eduardo Silva <eduardo@treasure-data.com>"
USER root
Expand Down
2 changes: 1 addition & 1 deletion docker-image/v1.15/debian-s3/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# AUTOMATICALLY GENERATED
# DO NOT EDIT THIS FILE DIRECTLY, USE /templates/Dockerfile.erb

FROM fluent/fluentd:v1.15.3-debian-amd64-1
FROM fluent/fluentd:v1.15.3-debian-amd64-1.2

LABEL maintainer="Eduardo Silva <eduardo@treasure-data.com>"
USER root
Expand Down
2 changes: 1 addition & 1 deletion docker-image/v1.15/debian-stackdriver/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# AUTOMATICALLY GENERATED
# DO NOT EDIT THIS FILE DIRECTLY, USE /templates/Dockerfile.erb

FROM fluent/fluentd:v1.15.3-debian-amd64-1
FROM fluent/fluentd:v1.15.3-debian-amd64-1.2

LABEL maintainer="Eduardo Silva <eduardo@treasure-data.com>"
USER root
Expand Down
2 changes: 1 addition & 1 deletion docker-image/v1.15/debian-syslog/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# AUTOMATICALLY GENERATED
# DO NOT EDIT THIS FILE DIRECTLY, USE /templates/Dockerfile.erb

FROM fluent/fluentd:v1.15.3-debian-amd64-1
FROM fluent/fluentd:v1.15.3-debian-amd64-1.2

LABEL maintainer="Eduardo Silva <eduardo@treasure-data.com>"
USER root
Expand Down
4 changes: 2 additions & 2 deletions templates/Dockerfile.erb
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@ ENV QEMU_DOWNLOAD_SHA256 5db25cccb40ac7b1ca857653b883376b931d91b06ff34ffe70dcf61
RUN apk add curl --no-cache
RUN curl -sL -o qemu-6.0.0.balena1-aarch64.tar.gz https://github.com/balena-io/qemu/releases/download/v6.0.0%2Bbalena1/qemu-6.0.0.balena1-aarch64.tar.gz && echo "$QEMU_DOWNLOAD_SHA256 *qemu-6.0.0.balena1-aarch64.tar.gz" | sha256sum -c - | tar zxvf qemu-6.0.0.balena1-aarch64.tar.gz -C . && mv qemu-6.0.0+balena1-aarch64/qemu-aarch64-static .

FROM fluent/fluentd:<%= fluentd_ver %>-debian-arm64-1
FROM fluent/fluentd:<%= fluentd_ver %>-debian-arm64-1.2
COPY --from=builder /go/qemu-aarch64-static /usr/bin/
<% else %>
FROM fluent/fluentd:<%= fluentd_ver %>-debian-amd64-1
FROM fluent/fluentd:<%= fluentd_ver %>-debian-amd64-1.2
<% end %>

LABEL maintainer="Eduardo Silva <eduardo@treasure-data.com>"
Expand Down

0 comments on commit d624543

Please sign in to comment.