diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index c09a2211f2..c7041d6aeb 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -27,6 +27,11 @@ jobs: with: node-version: 'v16.20.2' + # Setup a Docker "buildx" builder container, used by "build-push-action" + # below for multi-platform image builds. Notes on multi-platform images: + # https://github.com/elastic/apm-agent-nodejs/issues/4038#issuecomment-2130406402 + - uses: docker/setup-buildx-action@v3 + - name: Log in to the Elastic Container registry uses: docker/login-action@0d4c9c5ea7693da7b068278f7b52bda2a190a446 # v3.2.0 with: @@ -61,6 +66,7 @@ jobs: uses: docker/build-push-action@2cdde995de11925a030ce8070c3d77a52ffcf1c0 # v5.3.0 with: context: . + platforms: linux/amd64,linux/arm64 file: 'Dockerfile' push: true tags: ${{ steps.docker-meta.outputs.tags }} @@ -94,6 +100,7 @@ jobs: uses: docker/build-push-action@2cdde995de11925a030ce8070c3d77a52ffcf1c0 # v5.3.0 with: context: . + platforms: linux/amd64,linux/arm64 file: 'Dockerfile.wolfi' push: true tags: ${{ steps.docker-meta-wolfi.outputs.tags }} diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc index b6acc77975..2dc0685b9e 100644 --- a/CHANGELOG.asciidoc +++ b/CHANGELOG.asciidoc @@ -42,6 +42,12 @@ See the <> guide. [float] ===== Features +* Make published `docker.elastic.co/observability/apm-agent-nodejs` Docker + images multi-platform, with support for `linux/amd64,linux/arm64` for now. + This is necessary for users of the Elastic APM Attacher for Kubernetes, + when deploying to k8s nodes that are ARM64 (e.g. Gravitron on AWS). + ({issues}4038[#4038]) + [float] ===== Bug fixes @@ -49,6 +55,7 @@ See the <> guide. `@smithy/smithy-client` v3. (For example `@aws-sdk/client-s3@3.575.0` released 2024-05-13 updated to smithy-client v3.) Before this change the APM agent had been limiting patching of `@smithy/smithy-client` to `>=1 <3`. + ({pull}4036[#4036]) * Mark the published AWS Lambda layers as supporting the "nodejs20.x" Lambda Runtime (`--compatible-runtimes`). The "nodejs20.x" runtime was released by