Remove revision references

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 <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 <ref>    [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 <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'."
@@ -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}"

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