diff --git a/.github/workflows/docker-build.yaml b/.github/workflows/docker-build.yaml index 9cc272ca..c0c1118d 100644 --- a/.github/workflows/docker-build.yaml +++ b/.github/workflows/docker-build.yaml @@ -6,13 +6,7 @@ on: branches: - main paths: - - cmd/** - - pkg/** - - website/** - - Dockerfile - Dockerfile.* - - go.mod - - go.sum tags: - v*.*.* @@ -110,7 +104,7 @@ jobs: # cache-to: type=gha,mode=max platforms: | linux/amd64 - # linux/arm64 + linux/arm64 # Sign the resulting Docker image digest except on PRs. # This will only write to the public Rekor transparency log when the Docker @@ -152,7 +146,6 @@ jobs: with: image-ref: ${{ env.REGISTRY }}/${{ github.repository_owner }}/${{ matrix.Imagename }}:${{ github.sha }} ignore-unfixed: true - exit-code: '1' format: 'sarif' output: 'trivy-results.sarif' severity: 'CRITICAL,HIGH' diff --git a/Dockerfile.otel-collector b/Dockerfile.otel-collector index 6dd97469..5e20038b 100644 --- a/Dockerfile.otel-collector +++ b/Dockerfile.otel-collector @@ -1,7 +1,9 @@ -FROM debian:latest as journal -RUN apt update -RUN apt install -y systemd libssl-dev -FROM ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-contrib:latest +FROM --platform=${BUILDPLATFORM:-linux/amd64} debian:latest as journal +RUN apt update \ + && apt upgrade -y \ + && apt autoremove -y \ + && apt install -y systemd libssl-dev +FROM --platform=${BUILDPLATFORM:-linux/amd64} ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-contrib:latest LABEL source_repository="https://github.com/greenhouse-extensions" COPY --from=journal /lib/x86_64-linux-gnu/libc.so.6 /lib/x86_64-linux-gnu/libc.so.6 COPY --from=journal /lib64/ld-linux-x86-64.so.2 /lib64/ld-linux-x86-64.so.2