From edadef833e785b90e974a14f1700b11564982ac6 Mon Sep 17 00:00:00 2001 From: Adilhusain Shaikh Date: Fri, 1 Jul 2022 05:26:16 +0000 Subject: [PATCH] adding support for linux/pp64le arch --- .github/workflows/ci-goreleaser.yaml | 2 +- .github/workflows/release.yaml | 2 +- .goreleaser.yaml | 44 ++++++++++++++++++++++++++++ README.md | 2 +- 4 files changed, 47 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci-goreleaser.yaml b/.github/workflows/ci-goreleaser.yaml index 7614dff6c..8681fbeaf 100644 --- a/.github/workflows/ci-goreleaser.yaml +++ b/.github/workflows/ci-goreleaser.yaml @@ -27,7 +27,7 @@ jobs: - name: Setup QEMU uses: docker/setup-qemu-action@v2 with: - platforms: arm64 + platforms: arm64,ppc64le - name: Setup Docker Buildx uses: docker/setup-buildx-action@v2 diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 81733a0db..c8d67289d 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -18,7 +18,7 @@ jobs: - name: Setup QEMU uses: docker/setup-qemu-action@v2 with: - platforms: arm64 + platforms: arm64,ppc64le - name: Setup Docker Buildx uses: docker/setup-buildx-action@v2 diff --git a/.goreleaser.yaml b/.goreleaser.yaml index 2a64ea1e6..5ca9b3bff 100644 --- a/.goreleaser.yaml +++ b/.goreleaser.yaml @@ -9,6 +9,7 @@ builds: - "386" - amd64 - arm64 + - ppc64le ignore: - goos: darwin goarch: "386" @@ -32,6 +33,7 @@ builds: - "386" - amd64 - arm64 + - ppc64le ignore: - goos: darwin goarch: "386" @@ -163,6 +165,24 @@ dockers: - --label=org.opencontainers.image.version={{.Version}} - --label=org.opencontainers.image.source={{.GitURL}} use: buildx +- goos: linux + goarch: ppc64le + dockerfile: distributions/otelcol/Dockerfile + image_templates: + - otel/opentelemetry-collector:{{ .Version }}-ppc64le + - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector:{{ + .Version }}-ppc64le + extra_files: + - configs/otelcol.yaml + build_flag_templates: + - --pull + - --platform=linux/ppc64le + - --label=org.opencontainers.image.created={{.Date}} + - --label=org.opencontainers.image.name={{.ProjectName}} + - --label=org.opencontainers.image.revision={{.FullCommit}} + - --label=org.opencontainers.image.version={{.Version}} + - --label=org.opencontainers.image.source={{.GitURL}} + use: buildx - goos: linux goarch: "386" dockerfile: distributions/otelcol-contrib/Dockerfile @@ -217,12 +237,31 @@ dockers: - --label=org.opencontainers.image.version={{.Version}} - --label=org.opencontainers.image.source={{.GitURL}} use: buildx +- goos: linux + goarch: ppc64le + dockerfile: distributions/otelcol-contrib/Dockerfile + image_templates: + - otel/opentelemetry-collector-contrib:{{ .Version }}-ppc64le + - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-contrib:{{ + .Version }}-ppc64le + extra_files: + - configs/otelcol-contrib.yaml + build_flag_templates: + - --pull + - --platform=linux/ppc64le + - --label=org.opencontainers.image.created={{.Date}} + - --label=org.opencontainers.image.name={{.ProjectName}} + - --label=org.opencontainers.image.revision={{.FullCommit}} + - --label=org.opencontainers.image.version={{.Version}} + - --label=org.opencontainers.image.source={{.GitURL}} + use: buildx docker_manifests: - name_template: otel/opentelemetry-collector:{{ .Version }} image_templates: - otel/opentelemetry-collector:{{ .Version }}-386 - otel/opentelemetry-collector:{{ .Version }}-amd64 - otel/opentelemetry-collector:{{ .Version }}-arm64 + - otel/opentelemetry-collector:{{ .Version }}-ppc64le - name_template: ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector:{{ .Version }} image_templates: @@ -232,11 +271,14 @@ docker_manifests: .Version }}-amd64 - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector:{{ .Version }}-arm64 + - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector:{{ + .Version }}-ppc64le - name_template: otel/opentelemetry-collector-contrib:{{ .Version }} image_templates: - otel/opentelemetry-collector-contrib:{{ .Version }}-386 - otel/opentelemetry-collector-contrib:{{ .Version }}-amd64 - otel/opentelemetry-collector-contrib:{{ .Version }}-arm64 + - otel/opentelemetry-collector-contrib:{{ .Version }}-ppc64le - name_template: ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-contrib:{{ .Version }} image_templates: @@ -246,3 +288,5 @@ docker_manifests: .Version }}-amd64 - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-contrib:{{ .Version }}-arm64 + - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-contrib:{{ + .Version }}-ppc64le diff --git a/README.md b/README.md index 2c6ace037..4d12713cf 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ This repository assembles OpenTelemetry Collector distributions, such as the "co Each distribution contains: - Binaries for a multitude of platforms and architectures -- Multi-arch container images (x86_64 and arm64) +- Multi-arch container images (x86_64, arm64 and ppc64le) - Packages to be used with Linux distributions (apk, RPM, deb), Mac OS (brew) More details about each individual distribution can be seen in its own readme files.