From fb2148da39cd9e777688d503af335437740c2314 Mon Sep 17 00:00:00 2001 From: fcaffieri Date: Thu, 28 May 2026 21:55:05 -0300 Subject: [PATCH] Add logic to use -latest if dev images --- .github/workflows/check_integration_tools.yaml | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/.github/workflows/check_integration_tools.yaml b/.github/workflows/check_integration_tools.yaml index 581744c6..203831db 100644 --- a/.github/workflows/check_integration_tools.yaml +++ b/.github/workflows/check_integration_tools.yaml @@ -359,15 +359,23 @@ jobs: run: | DEPLOYMENT="${{ matrix.deployment_type }}" COMPOSE="wazuh-docker/${DEPLOYMENT}/docker-compose.yml" - TAG="${{ env.DOCKER_VERSION }}-${{ env.DOCKER_REVISION }}" + VERSION="${{ env.DOCKER_VERSION }}" + REVISION="${{ env.DOCKER_REVISION }}" REGISTRY="${{ env.DOCKER_REGISTRY }}" + # build-images.sh appends -latest when dev=true + commit=latest: + # dev=true, 5.0.0-beta2 → 5.0.0-beta2-latest + # dev=false, 5.0.0 → 5.0.0 + if [ -n "$REVISION" ]; then + TAG="${VERSION}-${REVISION}-latest" + else + TAG="${VERSION}" + fi + if [ "$REGISTRY" = "docker.io" ] || [ -z "$REGISTRY" ]; then - # DockerHub: no registry prefix needed echo "Patching ${COMPOSE}: wazuh/wazuh-*:${TAG} (DockerHub)" sed -i -E "s|(image: wazuh/wazuh-[^:]+:)[^ ]+|\1${TAG}|g" "$COMPOSE" else - # Private registry (ECR): add registry prefix echo "Patching ${COMPOSE}: ${REGISTRY}/wazuh/wazuh-*:${TAG}" sed -i -E "s|image: (wazuh/wazuh-[^:]+):[^ ]+|image: ${REGISTRY}/\1:${TAG}|g" "$COMPOSE" fi