Skip to content

Commit c5a4d1a

Browse files
authored
Pin serverless publish commit and add arch-specific image tags (#11299)
* Pass branch and commit info to the Publish to serverless pipeline * Tag internal release images per arch
1 parent 7bf9472 commit c5a4d1a

File tree

2 files changed

+14
-8
lines changed

2 files changed

+14
-8
lines changed

.buildkite/pipeline.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -374,3 +374,5 @@ steps:
374374
- label: "Publish to serverless"
375375
branches: main
376376
trigger: "agentless-serverless-release"
377+
build:
378+
commit: "${BUILDKITE_COMMIT}"

.buildkite/scripts/steps/ecp-internal-release.sh

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,14 @@ BUILD_VERSION="$(jq -r '.version' .package-version)"
3737
DOCKER_TAG="git-${VERSION}"
3838
PRIVATE_REPO="docker.elastic.co/observability-ci/ecp-elastic-agent-service"
3939
PRIVATE_IMAGE="${PRIVATE_REPO}:${DOCKER_TAG}"
40+
PRIVATE_IMAGE_AMD64="${PRIVATE_IMAGE}-amd64"
41+
PRIVATE_IMAGE_ARM64="${PRIVATE_IMAGE}-arm64"
4042

4143
echo "Build version: ${BUILD_VERSION}"
4244
echo "Docker tag: ${DOCKER_TAG}"
4345
echo "Target image: ${PRIVATE_IMAGE}"
46+
echo "AMD64 tag: ${PRIVATE_IMAGE_AMD64}"
47+
echo "ARM64 tag: ${PRIVATE_IMAGE_ARM64}"
4448

4549
echo "--- :arrow_down: Downloading build artifacts"
4650
echo "Downloading AMD64 build artifacts..."
@@ -51,21 +55,21 @@ buildkite-agent artifact download "build/distributions/**" . --step "packaging-s
5155
echo "--- :docker: Processing AMD64 image"
5256
echo "Loading AMD64 image..."
5357
docker load -i ./build/distributions/elastic-agent-service-$DOCKER_TAG-$BUILD_VERSION-linux-amd64.docker.tar.gz
54-
echo "Tagging AMD64 image as ${PRIVATE_IMAGE}..."
55-
docker image tag "elastic-agent-service:$DOCKER_TAG" "$PRIVATE_IMAGE"
58+
echo "Tagging AMD64 image as ${PRIVATE_IMAGE_AMD64}..."
59+
docker image tag "elastic-agent-service:$DOCKER_TAG" "$PRIVATE_IMAGE_AMD64"
5660
echo "Pushing AMD64 image..."
57-
docker push "$PRIVATE_IMAGE"
58-
AMD64_DIGEST=$(docker image inspect --format "{{index .RepoDigests 0}}" "$PRIVATE_IMAGE")
61+
docker push "$PRIVATE_IMAGE_AMD64"
62+
AMD64_DIGEST=$(docker image inspect --format "{{index .RepoDigests 0}}" "$PRIVATE_IMAGE_AMD64")
5963
echo "AMD64 digest: ${AMD64_DIGEST}"
6064

6165
echo "--- :docker: Processing ARM64 image"
6266
echo "Loading ARM64 image..."
6367
docker load -i ./build/distributions/elastic-agent-service-$DOCKER_TAG-$BUILD_VERSION-linux-arm64.docker.tar.gz
64-
echo "Tagging ARM64 image as ${PRIVATE_IMAGE}..."
65-
docker image tag "elastic-agent-service:$DOCKER_TAG" "$PRIVATE_IMAGE"
68+
echo "Tagging ARM64 image as ${PRIVATE_IMAGE_ARM64}..."
69+
docker image tag "elastic-agent-service:$DOCKER_TAG" "$PRIVATE_IMAGE_ARM64"
6670
echo "Pushing ARM64 image..."
67-
docker push "$PRIVATE_IMAGE"
68-
ARM64_DIGEST=$(docker image inspect --format "{{index .RepoDigests 0}}" "$PRIVATE_IMAGE")
71+
docker push "$PRIVATE_IMAGE_ARM64"
72+
ARM64_DIGEST=$(docker image inspect --format "{{index .RepoDigests 0}}" "$PRIVATE_IMAGE_ARM64")
6973
echo "ARM64 digest: ${ARM64_DIGEST}"
7074

7175
echo "--- :rocket: Creating multi-architecture manifest"

0 commit comments

Comments
 (0)