Refactor docker naming scheme

In order to follow more closely the existing tagging scheme this commit
refactors the naming for images to include the build sha BEFORE the SNAPSHOT
identifier. WHile this does not exactly follow the whole system that exists
today for container images in DRA it follows a pattern that is more similar.
Ideally we can iterate to fold handling of this container into DRA and in that
case consumers would not need to update their patterns for identifying images.

Author: donoghuc

.buildkite/scripts/common/qualified-version.sh

@@ -17,6 +17,11 @@ export QUALIFIED_VERSION="$(
   # e.g: 8.0.0-alpha1
   printf '%s' "${VERSION_QUALIFIER:+-${VERSION_QUALIFIER}}"
 
+  # Include git SHA if requested
+  if [[ -n "${INCLUDE_SHA:+x}" ]]; then
+    printf '%s' "-$(git rev-parse --short HEAD)"
+  fi
+
   # add the SNAPSHOT tag unless WORKFLOW_TYPE=="staging" or RELEASE=="1"
   if [[ ! ( "${WORKFLOW_TYPE:-}" == "staging" || "${RELEASE:+$RELEASE}" == "1" ) ]]; then
     printf '%s' "-SNAPSHOT"

.buildkite/scripts/dra/build-and-push-observability-sre.sh

@@ -15,21 +15,26 @@ echo "Building ObservabilitySRE container"
 
 echo "Pushing ObservabilitySRE container to Docker repository"
 docker_login
+
+# Get qualified version without SHA (this is what the gradle task will produce)
+export INCLUDE_SHA=""
 QUALIFIED_VERSION="$(.buildkite/scripts/common/qualified-version.sh)"
-SHA="$(git rev-parse --short HEAD)"
-REGISTRY_PATH=docker.elastic.co/logstash/logstash-observability-sre
 
-# Add architecture to the tags
-ARCH_TAG="${ARCH:-x86_64}"  # Default to x86_64 if ARCH is not set
+# Set environment variable to include SHA and get version with SHA
+export INCLUDE_SHA=1
+QUALIFIED_VERSION_WITH_SHA="$(.buildkite/scripts/common/qualified-version.sh)"
+
+REGISTRY_PATH=docker.elastic.co/logstash/logstash-observability-sre
 
-echo "Architecture: ${ARCH_TAG}"
+# Current architecture
+ARCH="${ARCH:-x86_64}"  # Default to x86_64 if ARCH is not set
+echo "Architecture: ${ARCH}"
 
-# Push a unique tag (version + SHA) for the current build WITH the architecture in the name
-# Ex: docker.elastic.co/logstash/logstash-observability-sre:8.19.0-SNAPSHOT-297226b1df-aarch64
-SHA_ARCH_TAG="${QUALIFIED_VERSION}-${SHA}-${ARCH_TAG}"
-echo "Tagging and pushing: ${REGISTRY_PATH}:${QUALIFIED_VERSION} as ${REGISTRY_PATH}:${SHA_ARCH_TAG}"
-docker tag ${REGISTRY_PATH}:${QUALIFIED_VERSION} ${REGISTRY_PATH}:${SHA_ARCH_TAG}
-docker push ${REGISTRY_PATH}:${SHA_ARCH_TAG}
+# Create the full tag with SHA and architecture
+FULL_TAG="${QUALIFIED_VERSION_WITH_SHA}-${ARCH}"
+echo "Tagging and pushing: ${REGISTRY_PATH}:${QUALIFIED_VERSION} as ${REGISTRY_PATH}:${FULL_TAG}"
+docker tag ${REGISTRY_PATH}:${QUALIFIED_VERSION} ${REGISTRY_PATH}:${FULL_TAG}
+docker push ${REGISTRY_PATH}:${FULL_TAG}
 
 # Teardown Docker environment
 source .buildkite/scripts/dra/docker-env-teardown.sh

.buildkite/scripts/dra/multi-architecture-observability-sre.sh

@@ -1,52 +1,55 @@
 #!/bin/bash
 # Script to create and push Docker manifest for multi-architecture support
-# This MUST be fun after build-and-push-observabilty-sre.sh! 
+# This MUST be run after build-and-push-observabilty-sre.sh!
 
 source .buildkite/scripts/common/vm-agent.sh
 source .buildkite/scripts/dra/docker-env-setup.sh
 
 docker_login
+
+# Set INCLUDE_SHA to include git SHA in version
+export INCLUDE_SHA=1
 QUALIFIED_VERSION="$(.buildkite/scripts/common/qualified-version.sh)"
-SHA="$(git rev-parse --short HEAD)"
 REGISTRY_PATH=docker.elastic.co/logstash/logstash-observability-sre
 
 # Architecture-specific tags (created by the build steps)
-X86_64_TAG="${QUALIFIED_VERSION}-${SHA}-x86_64"
-AARCH64_TAG="${QUALIFIED_VERSION}-${SHA}-aarch64"
+X86_64_TAG="${QUALIFIED_VERSION}-x86_64"
+AARCH64_TAG="${QUALIFIED_VERSION}-aarch64"
 
-# Target manifest tags
-SHA_MANIFEST_TAG="${QUALIFIED_VERSION}-${SHA}"
+# Target manifest tags - already has SHA from QUALIFIED_VERSION
 VERSION_MANIFEST_TAG="${QUALIFIED_VERSION}"
 
-# Create and push manifest with SHA
-echo "Creating manifest list for: ${REGISTRY_PATH}:${SHA_MANIFEST_TAG}"
-docker manifest create ${REGISTRY_PATH}:${SHA_MANIFEST_TAG} \
+# Create and push manifest with version (which already includes SHA)
+echo "Creating manifest list for: ${REGISTRY_PATH}:${VERSION_MANIFEST_TAG}"
+docker manifest create ${REGISTRY_PATH}:${VERSION_MANIFEST_TAG} \
   ${REGISTRY_PATH}:${X86_64_TAG} \
   ${REGISTRY_PATH}:${AARCH64_TAG}
 
-docker manifest annotate ${REGISTRY_PATH}:${SHA_MANIFEST_TAG} \
+docker manifest annotate ${REGISTRY_PATH}:${VERSION_MANIFEST_TAG} \
   ${REGISTRY_PATH}:${X86_64_TAG} --os linux --arch amd64
 
-docker manifest annotate ${REGISTRY_PATH}:${SHA_MANIFEST_TAG} \
+docker manifest annotate ${REGISTRY_PATH}:${VERSION_MANIFEST_TAG} \
   ${REGISTRY_PATH}:${AARCH64_TAG} --os linux --arch arm64
 
-echo "Pushing manifest: ${REGISTRY_PATH}:${SHA_MANIFEST_TAG}"
-docker manifest push ${REGISTRY_PATH}:${SHA_MANIFEST_TAG}
+echo "Pushing manifest: ${REGISTRY_PATH}:${VERSION_MANIFEST_TAG}"
+docker manifest push ${REGISTRY_PATH}:${VERSION_MANIFEST_TAG}
 
-# Create and push manifest without SHA (just version)
-echo "Creating manifest list for: ${REGISTRY_PATH}:${VERSION_MANIFEST_TAG}"
-docker manifest create ${REGISTRY_PATH}:${VERSION_MANIFEST_TAG} \
+# Also create version without SHA for effective "latest" tag
+export INCLUDE_SHA=""
+BASE_VERSION="$(.buildkite/scripts/common/qualified-version.sh)"
+echo "Creating manifest list for: ${REGISTRY_PATH}:${BASE_VERSION}"
+docker manifest create ${REGISTRY_PATH}:${BASE_VERSION} \
   ${REGISTRY_PATH}:${X86_64_TAG} \
   ${REGISTRY_PATH}:${AARCH64_TAG}
 
-docker manifest annotate ${REGISTRY_PATH}:${VERSION_MANIFEST_TAG} \
+docker manifest annotate ${REGISTRY_PATH}:${BASE_VERSION} \
   ${REGISTRY_PATH}:${X86_64_TAG} --os linux --arch amd64
 
-docker manifest annotate ${REGISTRY_PATH}:${VERSION_MANIFEST_TAG} \
+docker manifest annotate ${REGISTRY_PATH}:${BASE_VERSION} \
   ${REGISTRY_PATH}:${AARCH64_TAG} --os linux --arch arm64
 
-echo "Pushing manifest: ${REGISTRY_PATH}:${VERSION_MANIFEST_TAG}"
-docker manifest push ${REGISTRY_PATH}:${VERSION_MANIFEST_TAG}
+echo "Pushing manifest: ${REGISTRY_PATH}:${BASE_VERSION}"
+docker manifest push ${REGISTRY_PATH}:${BASE_VERSION}
 
 # Teardown Docker environment
 source .buildkite/scripts/dra/docker-env-teardown.sh