Merge pull request #2217 from wazuh/enhancement/2943-remove-revision-input

Remove revision input

.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

.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

.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 (only for dev): json array with commit-hash for each product'
         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 (only for dev): json array with commit-hash for each product'
         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 "---------------------------------------------"
@@ -211,7 +201,7 @@ jobs:
             exit 1
           fi
 
-          # Set each component's commit/revison based on the input lists
+          # Set each component's commit/revision based on the input lists
           for i in $(seq 0 $(($(echo "$WAZUH_COMPONENTS" | jq length) - 1))); do
             COMPONENT=$(echo "$WAZUH_COMPONENTS" | jq -r ".[$i]")
             COMMIT=$(echo "$COMMIT_LIST" | jq -r ".[$i]")
@@ -338,7 +328,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
@@ -403,7 +392,6 @@ jobs:
           if [ "${{ inputs.dev }}" = true ]; then
             ./build-images.sh \
               -v $WAZUH_VER \
-              -r $REVISION \
               -d $DEV_STAGE \
               -rg $IMAGE_REGISTRY \
               -m \
@@ -412,7 +400,6 @@ jobs:
           else
             ./build-images.sh \
               -v $WAZUH_VER \
-              -r $REVISION \
               -d $DEV_STAGE \
               -rg $IMAGE_REGISTRY \
               -m \
@@ -422,7 +409,6 @@ jobs:
           if [ "${{ inputs.dev }}" = true ]; then
             ./build-images.sh \
               -v $IMAGE_TAG \
-              -r $REVISION \
               -rg $IMAGE_REGISTRY \
               -m \
               -refs "$COMPONENT_REFS_JSON" \
@@ -430,7 +416,6 @@ jobs:
           else
             ./build-images.sh \
               -v $IMAGE_TAG \
-              -r $REVISION \
               -rg $IMAGE_REGISTRY \
               -m \
               -c ${{ matrix.wazuh_component }}

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))

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=''
 
@@ -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"
@@ -148,8 +145,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
@@ -201,7 +196,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
@@ -222,7 +216,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}"
@@ -255,7 +248,6 @@ help() {
     echo "Usage: $0 [OPTIONS]"
     echo
     echo "    -d, --dev <ref>              [Optional] Set the development stage you want to build, example rc2 or beta1, not used by default."
-    echo "    -r, --revision <rev>         [Optional] Package revision. By default ${WAZUH_TAG_REVISION}"
     echo "    -refs, --references <refs>   [Optional] [Only for Dev] JSON array of commit refs for components to be build (indexer, manager, dashboard, agent) in order. Defaults to latest."
     echo "    -rg, --registry <reg>        [Optional] Set the Docker registry to push the images."
     echo "    -c, --component <comp>       [Required] Set the Wazuh component to build. Accepted values: 'wazuh-indexer', 'wazuh-manager', 'wazuh-dashboard', 'wazuh-agent'."
@@ -287,14 +279,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
                 # Replace single quotes with double quotes to ensure it's valid JSON for jq processing

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}

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'

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

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

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

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 <ref>              [Optional] Set the development stage you want to build, example rc2 or beta1, not used by default.
-    -r, --revision <rev>         [Optional] Package revision. By default 1
     -refs, --references <ref>    [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 <reg>        [Optional] Set the Docker registry to push the images.
     -v, --version <ver>          [Optional] Set the Wazuh version should be builded. By default, 5.0.0.

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 |