Skip to content

Commit

Permalink
feat: make published Docker images multi-platform, add linux/arm64 pl…
Browse files Browse the repository at this point in the history
…at (#4058)

Closes: #4038
  • Loading branch information
trentm authored Jun 5, 2024
1 parent 24246bf commit 88ee807
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 0 deletions.
7 changes: 7 additions & 0 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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 }}
Expand Down Expand Up @@ -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 }}
Expand Down
7 changes: 7 additions & 0 deletions CHANGELOG.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -42,13 +42,20 @@ See the <<upgrade-to-v4>> 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
* Fix instrumentation for recent `@aws-sdk/client-*` releases that use
`@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
Expand Down

0 comments on commit 88ee807

Please sign in to comment.