diff --git a/.github/workflows/check-build.yml b/.github/workflows/check-build.yml index be67feb9e..c112a11c1 100644 --- a/.github/workflows/check-build.yml +++ b/.github/workflows/check-build.yml @@ -75,15 +75,13 @@ jobs: outputs: oci-mediatypes=false arm64: needs: define-matrix - runs-on: ubuntu-latest + runs-on: ubuntu-24.04-arm strategy: fail-fast: false matrix: component: ${{ fromJSON(needs.define-matrix.outputs.components) }} steps: - uses: actions/checkout@v4 - - name: Set up QEMU - uses: docker/setup-qemu-action@v3 - name: Set up Docker Buildx uses: docker/setup-buildx-action@v3 with: diff --git a/docker-image/v1.18/arm64/debian-azureblob/Dockerfile b/docker-image/v1.18/arm64/debian-azureblob/Dockerfile index b6b8246c9..01798d305 100644 --- a/docker-image/v1.18/arm64/debian-azureblob/Dockerfile +++ b/docker-image/v1.18/arm64/debian-azureblob/Dockerfile @@ -2,14 +2,7 @@ # DO NOT EDIT THIS FILE DIRECTLY, USE /templates/Dockerfile.erb # For multiarch build on Docker hub automated build. -FROM golang:alpine AS builder -WORKDIR /go -ENV QEMU_DOWNLOAD_SHA256 5db25cccb40ac7b1ca857653b883376b931d91b06ff34ffe70dcf6180bd07bb8 -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.18.0-debian-arm64-1.0 -COPY --from=builder /go/qemu-aarch64-static /usr/bin/ LABEL maintainer="Eduardo Silva " USER root diff --git a/docker-image/v1.18/arm64/debian-cloudwatch/Dockerfile b/docker-image/v1.18/arm64/debian-cloudwatch/Dockerfile index ccefe99a5..ab6f95f99 100644 --- a/docker-image/v1.18/arm64/debian-cloudwatch/Dockerfile +++ b/docker-image/v1.18/arm64/debian-cloudwatch/Dockerfile @@ -2,14 +2,7 @@ # DO NOT EDIT THIS FILE DIRECTLY, USE /templates/Dockerfile.erb # For multiarch build on Docker hub automated build. -FROM golang:alpine AS builder -WORKDIR /go -ENV QEMU_DOWNLOAD_SHA256 5db25cccb40ac7b1ca857653b883376b931d91b06ff34ffe70dcf6180bd07bb8 -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.18.0-debian-arm64-1.0 -COPY --from=builder /go/qemu-aarch64-static /usr/bin/ LABEL maintainer="Eduardo Silva " USER root diff --git a/docker-image/v1.18/arm64/debian-elasticsearch7/Dockerfile b/docker-image/v1.18/arm64/debian-elasticsearch7/Dockerfile index ccefe99a5..ab6f95f99 100644 --- a/docker-image/v1.18/arm64/debian-elasticsearch7/Dockerfile +++ b/docker-image/v1.18/arm64/debian-elasticsearch7/Dockerfile @@ -2,14 +2,7 @@ # DO NOT EDIT THIS FILE DIRECTLY, USE /templates/Dockerfile.erb # For multiarch build on Docker hub automated build. -FROM golang:alpine AS builder -WORKDIR /go -ENV QEMU_DOWNLOAD_SHA256 5db25cccb40ac7b1ca857653b883376b931d91b06ff34ffe70dcf6180bd07bb8 -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.18.0-debian-arm64-1.0 -COPY --from=builder /go/qemu-aarch64-static /usr/bin/ LABEL maintainer="Eduardo Silva " USER root diff --git a/docker-image/v1.18/arm64/debian-elasticsearch8/Dockerfile b/docker-image/v1.18/arm64/debian-elasticsearch8/Dockerfile index ccefe99a5..ab6f95f99 100644 --- a/docker-image/v1.18/arm64/debian-elasticsearch8/Dockerfile +++ b/docker-image/v1.18/arm64/debian-elasticsearch8/Dockerfile @@ -2,14 +2,7 @@ # DO NOT EDIT THIS FILE DIRECTLY, USE /templates/Dockerfile.erb # For multiarch build on Docker hub automated build. -FROM golang:alpine AS builder -WORKDIR /go -ENV QEMU_DOWNLOAD_SHA256 5db25cccb40ac7b1ca857653b883376b931d91b06ff34ffe70dcf6180bd07bb8 -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.18.0-debian-arm64-1.0 -COPY --from=builder /go/qemu-aarch64-static /usr/bin/ LABEL maintainer="Eduardo Silva " USER root diff --git a/docker-image/v1.18/arm64/debian-forward/Dockerfile b/docker-image/v1.18/arm64/debian-forward/Dockerfile index ccefe99a5..ab6f95f99 100644 --- a/docker-image/v1.18/arm64/debian-forward/Dockerfile +++ b/docker-image/v1.18/arm64/debian-forward/Dockerfile @@ -2,14 +2,7 @@ # DO NOT EDIT THIS FILE DIRECTLY, USE /templates/Dockerfile.erb # For multiarch build on Docker hub automated build. -FROM golang:alpine AS builder -WORKDIR /go -ENV QEMU_DOWNLOAD_SHA256 5db25cccb40ac7b1ca857653b883376b931d91b06ff34ffe70dcf6180bd07bb8 -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.18.0-debian-arm64-1.0 -COPY --from=builder /go/qemu-aarch64-static /usr/bin/ LABEL maintainer="Eduardo Silva " USER root diff --git a/docker-image/v1.18/arm64/debian-gcs/Dockerfile b/docker-image/v1.18/arm64/debian-gcs/Dockerfile index ccefe99a5..ab6f95f99 100644 --- a/docker-image/v1.18/arm64/debian-gcs/Dockerfile +++ b/docker-image/v1.18/arm64/debian-gcs/Dockerfile @@ -2,14 +2,7 @@ # DO NOT EDIT THIS FILE DIRECTLY, USE /templates/Dockerfile.erb # For multiarch build on Docker hub automated build. -FROM golang:alpine AS builder -WORKDIR /go -ENV QEMU_DOWNLOAD_SHA256 5db25cccb40ac7b1ca857653b883376b931d91b06ff34ffe70dcf6180bd07bb8 -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.18.0-debian-arm64-1.0 -COPY --from=builder /go/qemu-aarch64-static /usr/bin/ LABEL maintainer="Eduardo Silva " USER root diff --git a/docker-image/v1.18/arm64/debian-graylog/Dockerfile b/docker-image/v1.18/arm64/debian-graylog/Dockerfile index 71401c6b2..a1f6e766b 100644 --- a/docker-image/v1.18/arm64/debian-graylog/Dockerfile +++ b/docker-image/v1.18/arm64/debian-graylog/Dockerfile @@ -2,14 +2,7 @@ # DO NOT EDIT THIS FILE DIRECTLY, USE /templates/Dockerfile.erb # For multiarch build on Docker hub automated build. -FROM golang:alpine AS builder -WORKDIR /go -ENV QEMU_DOWNLOAD_SHA256 5db25cccb40ac7b1ca857653b883376b931d91b06ff34ffe70dcf6180bd07bb8 -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.18.0-debian-arm64-1.0 -COPY --from=builder /go/qemu-aarch64-static /usr/bin/ LABEL maintainer="Eduardo Silva " USER root diff --git a/docker-image/v1.18/arm64/debian-kafka/Dockerfile b/docker-image/v1.18/arm64/debian-kafka/Dockerfile index 538e7ba07..05ae7bcc4 100644 --- a/docker-image/v1.18/arm64/debian-kafka/Dockerfile +++ b/docker-image/v1.18/arm64/debian-kafka/Dockerfile @@ -2,14 +2,7 @@ # DO NOT EDIT THIS FILE DIRECTLY, USE /templates/Dockerfile.erb # For multiarch build on Docker hub automated build. -FROM golang:alpine AS builder -WORKDIR /go -ENV QEMU_DOWNLOAD_SHA256 5db25cccb40ac7b1ca857653b883376b931d91b06ff34ffe70dcf6180bd07bb8 -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.18.0-debian-arm64-1.0 -COPY --from=builder /go/qemu-aarch64-static /usr/bin/ LABEL maintainer="Eduardo Silva " USER root diff --git a/docker-image/v1.18/arm64/debian-kafka2/Dockerfile b/docker-image/v1.18/arm64/debian-kafka2/Dockerfile index 538e7ba07..05ae7bcc4 100644 --- a/docker-image/v1.18/arm64/debian-kafka2/Dockerfile +++ b/docker-image/v1.18/arm64/debian-kafka2/Dockerfile @@ -2,14 +2,7 @@ # DO NOT EDIT THIS FILE DIRECTLY, USE /templates/Dockerfile.erb # For multiarch build on Docker hub automated build. -FROM golang:alpine AS builder -WORKDIR /go -ENV QEMU_DOWNLOAD_SHA256 5db25cccb40ac7b1ca857653b883376b931d91b06ff34ffe70dcf6180bd07bb8 -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.18.0-debian-arm64-1.0 -COPY --from=builder /go/qemu-aarch64-static /usr/bin/ LABEL maintainer="Eduardo Silva " USER root diff --git a/docker-image/v1.18/arm64/debian-kinesis/Dockerfile b/docker-image/v1.18/arm64/debian-kinesis/Dockerfile index ccefe99a5..ab6f95f99 100644 --- a/docker-image/v1.18/arm64/debian-kinesis/Dockerfile +++ b/docker-image/v1.18/arm64/debian-kinesis/Dockerfile @@ -2,14 +2,7 @@ # DO NOT EDIT THIS FILE DIRECTLY, USE /templates/Dockerfile.erb # For multiarch build on Docker hub automated build. -FROM golang:alpine AS builder -WORKDIR /go -ENV QEMU_DOWNLOAD_SHA256 5db25cccb40ac7b1ca857653b883376b931d91b06ff34ffe70dcf6180bd07bb8 -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.18.0-debian-arm64-1.0 -COPY --from=builder /go/qemu-aarch64-static /usr/bin/ LABEL maintainer="Eduardo Silva " USER root diff --git a/docker-image/v1.18/arm64/debian-logentries/Dockerfile b/docker-image/v1.18/arm64/debian-logentries/Dockerfile index ccefe99a5..ab6f95f99 100644 --- a/docker-image/v1.18/arm64/debian-logentries/Dockerfile +++ b/docker-image/v1.18/arm64/debian-logentries/Dockerfile @@ -2,14 +2,7 @@ # DO NOT EDIT THIS FILE DIRECTLY, USE /templates/Dockerfile.erb # For multiarch build on Docker hub automated build. -FROM golang:alpine AS builder -WORKDIR /go -ENV QEMU_DOWNLOAD_SHA256 5db25cccb40ac7b1ca857653b883376b931d91b06ff34ffe70dcf6180bd07bb8 -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.18.0-debian-arm64-1.0 -COPY --from=builder /go/qemu-aarch64-static /usr/bin/ LABEL maintainer="Eduardo Silva " USER root diff --git a/docker-image/v1.18/arm64/debian-loggly/Dockerfile b/docker-image/v1.18/arm64/debian-loggly/Dockerfile index ccefe99a5..ab6f95f99 100644 --- a/docker-image/v1.18/arm64/debian-loggly/Dockerfile +++ b/docker-image/v1.18/arm64/debian-loggly/Dockerfile @@ -2,14 +2,7 @@ # DO NOT EDIT THIS FILE DIRECTLY, USE /templates/Dockerfile.erb # For multiarch build on Docker hub automated build. -FROM golang:alpine AS builder -WORKDIR /go -ENV QEMU_DOWNLOAD_SHA256 5db25cccb40ac7b1ca857653b883376b931d91b06ff34ffe70dcf6180bd07bb8 -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.18.0-debian-arm64-1.0 -COPY --from=builder /go/qemu-aarch64-static /usr/bin/ LABEL maintainer="Eduardo Silva " USER root diff --git a/docker-image/v1.18/arm64/debian-logzio/Dockerfile b/docker-image/v1.18/arm64/debian-logzio/Dockerfile index ccefe99a5..ab6f95f99 100644 --- a/docker-image/v1.18/arm64/debian-logzio/Dockerfile +++ b/docker-image/v1.18/arm64/debian-logzio/Dockerfile @@ -2,14 +2,7 @@ # DO NOT EDIT THIS FILE DIRECTLY, USE /templates/Dockerfile.erb # For multiarch build on Docker hub automated build. -FROM golang:alpine AS builder -WORKDIR /go -ENV QEMU_DOWNLOAD_SHA256 5db25cccb40ac7b1ca857653b883376b931d91b06ff34ffe70dcf6180bd07bb8 -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.18.0-debian-arm64-1.0 -COPY --from=builder /go/qemu-aarch64-static /usr/bin/ LABEL maintainer="Eduardo Silva " USER root diff --git a/docker-image/v1.18/arm64/debian-opensearch/Dockerfile b/docker-image/v1.18/arm64/debian-opensearch/Dockerfile index ccefe99a5..ab6f95f99 100644 --- a/docker-image/v1.18/arm64/debian-opensearch/Dockerfile +++ b/docker-image/v1.18/arm64/debian-opensearch/Dockerfile @@ -2,14 +2,7 @@ # DO NOT EDIT THIS FILE DIRECTLY, USE /templates/Dockerfile.erb # For multiarch build on Docker hub automated build. -FROM golang:alpine AS builder -WORKDIR /go -ENV QEMU_DOWNLOAD_SHA256 5db25cccb40ac7b1ca857653b883376b931d91b06ff34ffe70dcf6180bd07bb8 -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.18.0-debian-arm64-1.0 -COPY --from=builder /go/qemu-aarch64-static /usr/bin/ LABEL maintainer="Eduardo Silva " USER root diff --git a/docker-image/v1.18/arm64/debian-opensearch/conf/fluent.conf b/docker-image/v1.18/arm64/debian-opensearch/conf/fluent.conf index 8cc30ff75..3404e47b2 100644 --- a/docker-image/v1.18/arm64/debian-opensearch/conf/fluent.conf +++ b/docker-image/v1.18/arm64/debian-opensearch/conf/fluent.conf @@ -29,6 +29,7 @@ logstash_format "#{ENV['FLUENT_OPENSEARCH_LOGSTASH_FORMAT'] || 'false'}" logstash_prefix "#{ENV['FLUENT_OPENSEARCH_LOGSTASH_PREFIX'] || 'logstash'}" logstash_prefix_separator "#{ENV['FLUENT_OPENSEARCH_LOGSTASH_PREFIX_SEPARATOR'] || '-'}" + sniffer_class_name "#{ENV['FLUENT_OPENSEARCH_SNIFFER_CLASS_NAME'] || 'Fluent::Plugin::OpenSearchSimpleSniffer'}" flush_thread_count "#{ENV['FLUENT_OPENSEARCH_BUFFER_FLUSH_THREAD_COUNT'] || '1'}" flush_mode "#{ENV['FLUENT_OPENSEARCH_BUFFER_FLUSH_MODE'] || 'interval'}" diff --git a/docker-image/v1.18/arm64/debian-opensearch/entrypoint.sh b/docker-image/v1.18/arm64/debian-opensearch/entrypoint.sh index a09f4369f..0b73c29dc 100755 --- a/docker-image/v1.18/arm64/debian-opensearch/entrypoint.sh +++ b/docker-image/v1.18/arm64/debian-opensearch/entrypoint.sh @@ -4,4 +4,13 @@ # DO NOT EDIT THIS FILE DIRECTLY, USE /templates/entrypoint.sh.erb +set -e + +SIMPLE_SNIFFER=$( gem contents fluent-plugin-opensearch | grep opensearch_simple_sniffer.rb ) + +if [ -n "$SIMPLE_SNIFFER" -a -f "$SIMPLE_SNIFFER" ] ; then + FLUENTD_OPT="$FLUENTD_OPT -r $SIMPLE_SNIFFER" +fi + + exec fluentd -c /fluentd/etc/${FLUENTD_CONF} -p /fluentd/plugins --gemfile /fluentd/Gemfile ${FLUENTD_OPT} diff --git a/docker-image/v1.18/arm64/debian-papertrail/Dockerfile b/docker-image/v1.18/arm64/debian-papertrail/Dockerfile index ccefe99a5..ab6f95f99 100644 --- a/docker-image/v1.18/arm64/debian-papertrail/Dockerfile +++ b/docker-image/v1.18/arm64/debian-papertrail/Dockerfile @@ -2,14 +2,7 @@ # DO NOT EDIT THIS FILE DIRECTLY, USE /templates/Dockerfile.erb # For multiarch build on Docker hub automated build. -FROM golang:alpine AS builder -WORKDIR /go -ENV QEMU_DOWNLOAD_SHA256 5db25cccb40ac7b1ca857653b883376b931d91b06ff34ffe70dcf6180bd07bb8 -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.18.0-debian-arm64-1.0 -COPY --from=builder /go/qemu-aarch64-static /usr/bin/ LABEL maintainer="Eduardo Silva " USER root diff --git a/docker-image/v1.18/arm64/debian-s3/Dockerfile b/docker-image/v1.18/arm64/debian-s3/Dockerfile index 7012dbe57..52cf95bd2 100644 --- a/docker-image/v1.18/arm64/debian-s3/Dockerfile +++ b/docker-image/v1.18/arm64/debian-s3/Dockerfile @@ -2,14 +2,7 @@ # DO NOT EDIT THIS FILE DIRECTLY, USE /templates/Dockerfile.erb # For multiarch build on Docker hub automated build. -FROM golang:alpine AS builder -WORKDIR /go -ENV QEMU_DOWNLOAD_SHA256 5db25cccb40ac7b1ca857653b883376b931d91b06ff34ffe70dcf6180bd07bb8 -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.18.0-debian-arm64-1.0 -COPY --from=builder /go/qemu-aarch64-static /usr/bin/ LABEL maintainer="Eduardo Silva " USER root diff --git a/docker-image/v1.18/arm64/debian-syslog/Dockerfile b/docker-image/v1.18/arm64/debian-syslog/Dockerfile index ccefe99a5..ab6f95f99 100644 --- a/docker-image/v1.18/arm64/debian-syslog/Dockerfile +++ b/docker-image/v1.18/arm64/debian-syslog/Dockerfile @@ -2,14 +2,7 @@ # DO NOT EDIT THIS FILE DIRECTLY, USE /templates/Dockerfile.erb # For multiarch build on Docker hub automated build. -FROM golang:alpine AS builder -WORKDIR /go -ENV QEMU_DOWNLOAD_SHA256 5db25cccb40ac7b1ca857653b883376b931d91b06ff34ffe70dcf6180bd07bb8 -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.18.0-debian-arm64-1.0 -COPY --from=builder /go/qemu-aarch64-static /usr/bin/ LABEL maintainer="Eduardo Silva " USER root diff --git a/templates/Dockerfile.erb b/templates/Dockerfile.erb index 9cb8baace..d30afa702 100644 --- a/templates/Dockerfile.erb +++ b/templates/Dockerfile.erb @@ -7,14 +7,7 @@ <% if is_arm64 %> # For multiarch build on Docker hub automated build. -FROM golang:alpine AS builder -WORKDIR /go -ENV QEMU_DOWNLOAD_SHA256 5db25cccb40ac7b1ca857653b883376b931d91b06ff34ffe70dcf6180bd07bb8 -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.0 -COPY --from=builder /go/qemu-aarch64-static /usr/bin/ <% else %> FROM fluent/fluentd:<%= fluentd_ver %>-debian-amd64-1.0 <% end %>