From 06c2c2c46a6d86a3e996ba06858714711a404d54 Mon Sep 17 00:00:00 2001 From: Victor Carlos Erenu Date: Fri, 13 Feb 2026 17:36:03 +0700 Subject: [PATCH 1/2] Remove revision references --- .env | 2 -- .github/workflows/5_pr_check.yml | 3 --- .../Procedure_push_docker_images.yml | 19 ++++--------------- build-docker-images/build-images.sh | 16 ---------------- build-docker-images/build-images.yml | 5 ----- build-docker-images/wazuh-agent/Dockerfile | 1 - .../wazuh-dashboard/Dockerfile | 2 -- build-docker-images/wazuh-indexer/Dockerfile | 1 - build-docker-images/wazuh-manager/Dockerfile | 1 - docs/dev/build-image.md | 1 - docs/dev/workflow-usage.md | 1 - 11 files changed, 4 insertions(+), 48 deletions(-) diff --git a/.env b/.env index 2146280d..2e783ae2 100755 --- a/.env +++ b/.env @@ -1,6 +1,4 @@ WAZUH_VERSION=5.0.0 WAZUH_IMAGE_VERSION=5.0.0 -WAZUH_TAG_REVISION=1 -WAZUH_UI_REVISION=1 WAZUH_REGISTRY=docker.io IMAGE_TAG=5.0.0 diff --git a/.github/workflows/5_pr_check.yml b/.github/workflows/5_pr_check.yml index 8fa39f8f..0d32e3c6 100644 --- a/.github/workflows/5_pr_check.yml +++ b/.github/workflows/5_pr_check.yml @@ -11,8 +11,6 @@ jobs: outputs: WAZUH_VERSION: ${{ steps.dotenv.outputs.WAZUH_VERSION }} WAZUH_IMAGE_VERSION: ${{ steps.dotenv.outputs.WAZUH_IMAGE_VERSION }} - WAZUH_TAG_REVISION: ${{ steps.dotenv.outputs.WAZUH_TAG_REVISION }} - WAZUH_UI_REVISION: ${{ steps.dotenv.outputs.WAZUH_UI_REVISION }} WAZUH_REGISTRY: ${{ vars.IMAGE_REGISTRY_DEV }} IMAGE_TAG: ${{ steps.dotenv.outputs.IMAGE_TAG }} WAZUH_MINOR_VERSION: ${{ steps.dotenv.outputs.WAZUH_MINOR_VERSION }} @@ -39,7 +37,6 @@ jobs: with: image_tag: ${{ needs.prepare-variables.outputs.WAZUH_IMAGE_VERSION }} docker_reference: ${{ github.head_ref }} - revision: ${{ needs.prepare-variables.outputs.WAZUH_TAG_REVISION }} commit_list: '["latest", "latest", "latest", "latest"]' id: ${{ github.run_id }} dev: true diff --git a/.github/workflows/Procedure_push_docker_images.yml b/.github/workflows/Procedure_push_docker_images.yml index 864e4ffe..b3fc2a99 100644 --- a/.github/workflows/Procedure_push_docker_images.yml +++ b/.github/workflows/Procedure_push_docker_images.yml @@ -16,10 +16,6 @@ on: default: 'wazuh-manager,wazuh-dashboard,wazuh-indexer,wazuh-agent' required: false type: string - revision: - description: 'Package revision' - default: '1' - required: true commit_list: description: 'Wazuh components revisions (comma-separated string list) ["indexer", "manager", "dashboard", "agent"]' type: string @@ -49,11 +45,6 @@ on: default: 'wazuh-manager,wazuh-dashboard,wazuh-indexer,wazuh-agent' required: false type: string - revision: - description: 'Package revision' - default: '1' - required: true - type: string commit_list: description: 'Wazuh components revisions (comma-separated string list) ["indexer", "manager", "dashboard", "agent"]' type: string @@ -95,7 +86,6 @@ jobs: echo "* image_tag: ${{ inputs.image_tag }}" echo "* docker_reference: ${{ inputs.docker_reference }}" echo "* products: ${{ inputs.products }}" - echo "* revision: ${{ inputs.revision }}" echo "* dev: ${{ inputs.dev }}" echo "* commit_list: ${{ inputs.commit_list }}" echo "---------------------------------------------" @@ -292,7 +282,6 @@ jobs: env: IMAGE_REGISTRY: ${{ inputs.dev && vars.IMAGE_REGISTRY_DEV || vars.IMAGE_REGISTRY_PROD }} IMAGE_TAG: ${{ inputs.image_tag }} - REVISION: ${{ inputs.revision }} steps: - name: Checkout repository @@ -343,15 +332,15 @@ jobs: DEV_STAGE=${tokens[1]} WAZUH_VER=${tokens[0]} if [ "${{ inputs.dev }}" = true ]; then - ./build-images.sh -v $WAZUH_VER -r $REVISION -d $DEV_STAGE -rg $IMAGE_REGISTRY -m -refs "$COMMIT_LIST" -c ${{ matrix.wazuh_component }} + ./build-images.sh -v $WAZUH_VER -d $DEV_STAGE -rg $IMAGE_REGISTRY -m -refs "$COMMIT_LIST" -c ${{ matrix.wazuh_component }} else - ./build-images.sh -v $WAZUH_VER -r $REVISION -d $DEV_STAGE -rg $IMAGE_REGISTRY -m -c ${{ matrix.wazuh_component }} + ./build-images.sh -v $WAZUH_VER -d $DEV_STAGE -rg $IMAGE_REGISTRY -m -c ${{ matrix.wazuh_component }} fi else if [ "${{ inputs.dev }}" = true ]; then - ./build-images.sh -v $IMAGE_TAG -r $REVISION -rg $IMAGE_REGISTRY -m -refs "$COMMIT_LIST" -c ${{ matrix.wazuh_component }} + ./build-images.sh -v $IMAGE_TAG -rg $IMAGE_REGISTRY -m -refs "$COMMIT_LIST" -c ${{ matrix.wazuh_component }} else - ./build-images.sh -v $IMAGE_TAG -r $REVISION -rg $IMAGE_REGISTRY -m -c ${{ matrix.wazuh_component }} + ./build-images.sh -v $IMAGE_TAG -rg $IMAGE_REGISTRY -m -c ${{ matrix.wazuh_component }} fi fi # Save .env file (generated by build-images.sh) contents to $GITHUB_ENV diff --git a/build-docker-images/build-images.sh b/build-docker-images/build-images.sh index aba70691..cde40224 100755 --- a/build-docker-images/build-images.sh +++ b/build-docker-images/build-images.sh @@ -11,13 +11,11 @@ WAZUH_IMAGE_VERSION=5.0.0 IMAGE_TAG=5.0.0 WAZUH_VERSION=$(echo $WAZUH_IMAGE_VERSION | sed -e 's/\.//g') -WAZUH_TAG_REVISION=1 WAZUH_CURRENT_VERSION=$(curl --silent https://api.github.com/repos/wazuh/wazuh/releases/latest | grep '["]tag_name["]:' | sed -E 's/.*\"([^\"]+)\".*/\1/' | cut -c 2- | sed -e 's/\.//g') IMAGE_VERSION=${WAZUH_IMAGE_VERSION} WAZUH_REGISTRY=docker.io WAZUH_IMAGE_VERSION="5.0.0" -WAZUH_TAG_REVISION="1" WAZUH_DEV_STAGE="" WAZUH_COMPONENTS_COMMIT_LIST='["latest", "latest", "latest", "latest"]' @@ -42,7 +40,6 @@ build() { WAZUH_VERSION="$(echo $WAZUH_IMAGE_VERSION | sed -e 's/\.//g')" WAZUH_MINOR_VERSION="${WAZUH_IMAGE_VERSION%.*}" - WAZUH_UI_REVISION="${WAZUH_TAG_REVISION}" # Variables ARTIFACT_URLS_FILE="artifact_urls.yml" @@ -107,8 +104,6 @@ build() { # Global env file (without IMAGE_TAG - will be component-specific) echo WAZUH_VERSION=$WAZUH_IMAGE_VERSION > ../.env echo WAZUH_IMAGE_VERSION=$WAZUH_IMAGE_VERSION >> ../.env - echo WAZUH_TAG_REVISION=$WAZUH_TAG_REVISION >> ../.env - echo WAZUH_UI_REVISION=$WAZUH_UI_REVISION >> ../.env echo WAZUH_REGISTRY=$WAZUH_REGISTRY >> ../.env set -a @@ -160,7 +155,6 @@ build() { build_args=( -t "${WAZUH_REGISTRY}/wazuh/${component}:${IMAGE_TAG}" --build-arg WAZUH_VERSION="${WAZUH_IMAGE_VERSION}" - --build-arg WAZUH_TAG_REVISION="${WAZUH_TAG_REVISION}" ) # Add component-specific args @@ -181,7 +175,6 @@ build() { ;; wazuh-dashboard) build_args+=( - --build-arg WAZUH_UI_REVISION="${WAZUH_UI_REVISION}" --build-arg wazuh_dashboard_amd64_rpm="${wazuh_dashboard_amd64_rpm}" --build-arg wazuh_dashboard_arm64_rpm="${wazuh_dashboard_arm64_rpm}" --build-arg wazuh_certs_tool="${wazuh_certs_tool}" @@ -214,7 +207,6 @@ help() { echo "Usage: $0 [OPTIONS]" echo echo " -d, --dev [Optional] Set the development stage you want to build, example rc2 or beta1, not used by default." - echo " -r, --revision [Optional] Package revision. By default ${WAZUH_TAG_REVISION}" echo " -refs, --references [Optional] Set each Wazuh component reference to be build (indexer, manager, dasboard and agent). Only used for development builds. By default, using the latest release: ['latest', 'latest', 'latest', 'latest']" echo " -rg, --registry [Optional] Set the Docker registry to push the images." echo " -c, --component [Required] Set the Wazuh component to build. Accepted values: 'wazuh-indexer', 'wazuh-manager', 'wazuh-dashboard', 'wazuh-agent'." @@ -246,14 +238,6 @@ main() { MULTIARCH="true" shift ;; - "-r"|"--revision") - if [ -n "${2}" ]; then - WAZUH_TAG_REVISION="${2}" - shift 2 - else - help 1 - fi - ;; "-refs"|"--references") if [ -n "${2}" ]; then WAZUH_COMPONENTS_COMMIT_LIST="${2}" diff --git a/build-docker-images/build-images.yml b/build-docker-images/build-images.yml index e0544df0..ba7feaa2 100644 --- a/build-docker-images/build-images.yml +++ b/build-docker-images/build-images.yml @@ -5,7 +5,6 @@ services: context: wazuh-manager/ args: WAZUH_VERSION: ${WAZUH_VERSION} - WAZUH_TAG_REVISION: ${WAZUH_TAG_REVISION} wazuh_manager_amd64_rpm: ${wazuh_manager_amd64_rpm} wazuh_manager_arm64_rpm: ${wazuh_manager_arm64_rpm} wazuh_certs_tool: ${wazuh_certs_tool} @@ -36,7 +35,6 @@ services: context: wazuh-agent/ args: WAZUH_VERSION: ${WAZUH_VERSION} - WAZUH_TAG_REVISION: ${WAZUH_TAG_REVISION} wazuh_agent_amd64_rpm: ${wazuh_agent_amd64_rpm} wazuh_agent_arm64_rpm: ${wazuh_agent_arm64_rpm} image: ${WAZUH_REGISTRY}/wazuh/wazuh-agent:${IMAGE_TAG} @@ -48,7 +46,6 @@ services: context: wazuh-indexer/ args: WAZUH_VERSION: ${WAZUH_VERSION} - WAZUH_TAG_REVISION: ${WAZUH_TAG_REVISION} wazuh_indexer_amd64_rpm: ${wazuh_indexer_amd64_rpm} wazuh_indexer_arm64_rpm: ${wazuh_indexer_arm64_rpm} wazuh_certs_tool: ${wazuh_certs_tool} @@ -73,8 +70,6 @@ services: context: wazuh-dashboard/ args: WAZUH_VERSION: ${WAZUH_VERSION} - WAZUH_TAG_REVISION: ${WAZUH_TAG_REVISION} - WAZUH_UI_REVISION: ${WAZUH_UI_REVISION} wazuh_dashboard_amd64_rpm: ${wazuh_dashboard_amd64_rpm} wazuh_dashboard_arm64_rpm: ${wazuh_dashboard_arm64_rpm} wazuh_certs_tool: ${wazuh_certs_tool} diff --git a/build-docker-images/wazuh-agent/Dockerfile b/build-docker-images/wazuh-agent/Dockerfile index 7abdad3d..162135c9 100644 --- a/build-docker-images/wazuh-agent/Dockerfile +++ b/build-docker-images/wazuh-agent/Dockerfile @@ -4,7 +4,6 @@ FROM amazonlinux:2023 RUN rm /bin/sh && ln -s /bin/bash /bin/sh ARG WAZUH_VERSION -ARG WAZUH_TAG_REVISION ARG S6_VERSION="v2.2.0.3" ARG WAZUH_MANAGER='CHANGE_MANAGER_IP' ARG WAZUH_MANAGER_PORT='CHANGE_MANAGER_PORT' diff --git a/build-docker-images/wazuh-dashboard/Dockerfile b/build-docker-images/wazuh-dashboard/Dockerfile index bef9cabf..cd146418 100644 --- a/build-docker-images/wazuh-dashboard/Dockerfile +++ b/build-docker-images/wazuh-dashboard/Dockerfile @@ -2,8 +2,6 @@ FROM amazonlinux:2023 AS builder ARG WAZUH_VERSION -ARG WAZUH_TAG_REVISION -ARG WAZUH_UI_REVISION ARG INSTALL_DIR=/usr/share/wazuh-dashboard ARG TARGETARCH ARG wazuh_dashboard_amd64_rpm diff --git a/build-docker-images/wazuh-indexer/Dockerfile b/build-docker-images/wazuh-indexer/Dockerfile index a3801e22..726ac9de 100644 --- a/build-docker-images/wazuh-indexer/Dockerfile +++ b/build-docker-images/wazuh-indexer/Dockerfile @@ -2,7 +2,6 @@ FROM amazonlinux:2023 AS builder ARG WAZUH_VERSION -ARG WAZUH_TAG_REVISION ARG TARGETARCH ARG wazuh_indexer_amd64_rpm ARG wazuh_indexer_arm64_rpm diff --git a/build-docker-images/wazuh-manager/Dockerfile b/build-docker-images/wazuh-manager/Dockerfile index 6051ad2c..92621c5b 100644 --- a/build-docker-images/wazuh-manager/Dockerfile +++ b/build-docker-images/wazuh-manager/Dockerfile @@ -4,7 +4,6 @@ FROM amazonlinux:2023 RUN rm /bin/sh && ln -s /bin/bash /bin/sh ARG WAZUH_VERSION -ARG WAZUH_TAG_REVISION ARG S6_VERSION="v2.2.0.3" ARG TARGETARCH ARG wazuh_manager_amd64_rpm diff --git a/docs/dev/build-image.md b/docs/dev/build-image.md index f007b892..2bc86b43 100644 --- a/docs/dev/build-image.md +++ b/docs/dev/build-image.md @@ -30,7 +30,6 @@ To get all the available script options use the `-h` or `--help` option: Usage: build-images.sh [OPTIONS] -d, --dev [Optional] Set the development stage you want to build, example rc2 or beta1, not used by default. - -r, --revision [Optional] Package revision. By default 1 -refs, --references [Optional] Set each Wazuh component reference to be build (indexer, manager, dasboard and agent). By default, using the latest release: ['latest', 'latest', 'latest', 'latest'] -rg, --registry [Optional] Set the Docker registry to push the images. -v, --version [Optional] Set the Wazuh version should be builded. By default, 5.0.0. diff --git a/docs/dev/workflow-usage.md b/docs/dev/workflow-usage.md index 236786d2..f280b34c 100644 --- a/docs/dev/workflow-usage.md +++ b/docs/dev/workflow-usage.md @@ -8,7 +8,6 @@ The Procedure_push_docker_images.yml workflow builds and pushes multi-architectu |-----------|-------------|---------|----------| | `image_tag` | Docker image version tag | `5.0.0` | Yes | | `docker_reference` | Branch/tag to build from | - | Yes | -| `revision` | Package revision number | `1` | Yes | | `reference` | Dev reference (for pre-release builds) | `latest` | No | | `id` | Workflow run identifier | - | No | | `dev` | Enable development mode (adds `-dev` suffix) | `false`/`true` | No | From 70c0a61a519bcdafd7e3e62a2681126f901b6833 Mon Sep 17 00:00:00 2001 From: Victor Carlos Erenu Date: Fri, 13 Feb 2026 22:59:43 +0700 Subject: [PATCH 2/2] Add Changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index f8de0607..2216e12d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,7 @@ All notable changes to this project will be documented in this file. ### Changed +- Remove revision input ([#2217](https://github.com/wazuh/wazuh-docker/pull/2217)) - Improve build script and workflow component revisions handling ([#2212](https://github.com/wazuh/wazuh-docker/pull/2212)) - Add Wazuh version and revision into wazuh-certs-tool and config file ([#2195](https://github.com/wazuh/wazuh-docker/pull/2195)) - Improve S3 artifact URLs handling ([#2183](https://github.com/wazuh/wazuh-docker/pull/2183))