diff --git a/.github/workflows/5_pr_check.yml b/.github/workflows/5_pr_check.yml index 283f4fad..4e51ca06 100644 --- a/.github/workflows/5_pr_check.yml +++ b/.github/workflows/5_pr_check.yml @@ -44,7 +44,7 @@ jobs: with: image_tag: ${{ needs.prepare-variables.outputs.WAZUH_IMAGE_VERSION }} docker_reference: ${{ github.head_ref || inputs.docker_reference }} - wazuh_automation_reference: 'v5.0.0-beta2' + wazuh_automation_reference: 'main' commit_list: '["latest", "latest", "latest", "latest"]' assistant_revision: 'latest' id: ${{ github.run_id }} diff --git a/.github/workflows/Procedure_push_docker_images.yml b/.github/workflows/Procedure_push_docker_images.yml index 6dcd2dfb..28e9e104 100644 --- a/.github/workflows/Procedure_push_docker_images.yml +++ b/.github/workflows/Procedure_push_docker_images.yml @@ -6,7 +6,7 @@ on: inputs: image_tag: description: 'Docker image tag' - default: 'v5.0.0-beta2' + default: '5.0.0' required: true docker_reference: description: 'wazuh-docker reference' @@ -14,7 +14,7 @@ on: wazuh_automation_reference: description: 'Branch or tag of the wazuh-automation repository' required: false - default: 'v5.0.0-beta2' + default: 'main' products: description: 'Comma-separated list of the image names to build and push' default: 'wazuh-manager,wazuh-dashboard,wazuh-indexer,wazuh-agent' @@ -42,7 +42,7 @@ on: inputs: image_tag: description: 'Docker image tag' - default: 'v5.0.0-beta2' + default: '5.0.0' required: true type: string docker_reference: @@ -52,7 +52,7 @@ on: wazuh_automation_reference: description: 'Branch or tag of the wazuh-automation repository' required: false - default: 'v5.0.0-beta2' + default: 'main' type: string products: description: 'Comma-separated list of the image names to build and push' diff --git a/build-docker-images/build-images.sh b/build-docker-images/build-images.sh index 153bf18e..be5661d4 100755 --- a/build-docker-images/build-images.sh +++ b/build-docker-images/build-images.sh @@ -42,7 +42,7 @@ build() { WAZUH_MINOR_VERSION="${WAZUH_IMAGE_VERSION%.*}" # WAZUH_MAJOR_VERSION: Extracts major version only (e.g., 5.0.0 -> 5) WAZUH_MAJOR_VERSION="${WAZUH_IMAGE_VERSION%%.*}" - # WAZUH_STAGE: Extract the 'stage' (e.g., alpha0, beta2, rc2) from the local JSON metadata file. + # WAZUH_STAGE: Extract the 'stage' (e.g., alpha0, beta1, rc2) from the local JSON metadata file. # Note: This is primarily used for pre-release package naming. WAZUH_STAGE=$(jq -r '.stage' ../VERSION.json) # ARTIFACT_URLS_FILE: The name of the artifact URLs file. @@ -235,9 +235,9 @@ build() { # The commit suffix is only appended when --dev was passed, which maps # directly to inputs.dev=true in the workflow. This ensures: # dev=false, tag=5.0.0 → 5.0.0 - # dev=false, tag=5.0.0-beta2 → 5.0.0-beta2 + # dev=false, tag=5.0.0-beta1 → 5.0.0-beta1 # dev=true, tag=5.0.0 → 5.0.0-latest - # dev=true, tag=5.0.0-beta2 → 5.0.0-beta2-latest + # dev=true, tag=5.0.0-beta1 → 5.0.0-beta1-latest if [ -n "${IS_DEV_BUILD}" ]; then IMAGE_TAG="${WAZUH_IMAGE_VERSION}${WAZUH_DEV_STAGE:+-${WAZUH_DEV_STAGE,,}}-${COMPONENT_COMMIT}" else @@ -301,7 +301,7 @@ help() { echo echo "Usage: $0 [OPTIONS]" echo - echo " -d, --dev-stage [Optional] Set the pre-release stage suffix (e.g. beta2, rc2). Not used by default." + echo " -d, --dev-stage [Optional] Set the pre-release stage suffix (e.g. beta1, rc2). Not used by default." echo " --dev [Optional] Mark as a development build: appends the commit ref to the image tag. Controlled by inputs.dev in the workflow." echo " -refs, --references [Optional] [Only with --dev] JSON array of commit refs for components (indexer, manager, dashboard, agent) in order. Defaults to 'latest'." echo " -rg, --registry [Optional] Set the Docker registry to push the images." diff --git a/docs/dev/build-image.md b/docs/dev/build-image.md index 7d593bfc..2bc86b43 100644 --- a/docs/dev/build-image.md +++ b/docs/dev/build-image.md @@ -29,7 +29,7 @@ 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 beta2, not used by default. + -d, --dev [Optional] Set the development stage you want to build, example rc2 or beta1, not used by default. -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/ref/upgrade.md b/docs/ref/upgrade.md index 06ad2fdb..7e15c983 100644 --- a/docs/ref/upgrade.md +++ b/docs/ref/upgrade.md @@ -24,15 +24,15 @@ Below is a step-by-step example of how to perform this update: ```yaml services: wazuh.manager: - image: wazuh/wazuh-manager:5.0.0-beta2 + image: wazuh/wazuh-manager:5.0.0 ... wazuh.indexer: - image: wazuh/wazuh-indexer:5.0.0-beta2 + image: wazuh/wazuh-indexer:5.0.0 ... wazuh.dashboard: - image: wazuh/wazuh-dashboard:5.0.0-beta2 + image: wazuh/wazuh-dashboard:5.0.0 ... ``` @@ -48,27 +48,27 @@ Below is a step-by-step example of how to perform this update: ```yaml services: wazuh.master: - image: wazuh/wazuh-manager:5.0.0-beta2 + image: wazuh/wazuh-manager:5.0.0 ... wazuh.worker: - image: wazuh/wazuh-manager:5.0.0-beta2 + image: wazuh/wazuh-manager:5.0.0 ... wazuh1.indexer: - image: wazuh/wazuh-indexer:5.0.0-beta2 + image: wazuh/wazuh-indexer:5.0.0 ... wazuh2.indexer: - image: wazuh/wazuh-indexer:5.0.0-beta2 + image: wazuh/wazuh-indexer:5.0.0 ... wazuh3.indexer: - image: wazuh/wazuh-indexer:5.0.0-beta2 + image: wazuh/wazuh-indexer:5.0.0 ... wazuh.dashboard: - image: wazuh/wazuh-dashboard:5.0.0-beta2 + image: wazuh/wazuh-dashboard:5.0.0 ... ``` diff --git a/multi-node/docker-compose.yml b/multi-node/docker-compose.yml index 499d3351..3076d6b0 100644 --- a/multi-node/docker-compose.yml +++ b/multi-node/docker-compose.yml @@ -1,7 +1,7 @@ # Wazuh App Copyright (C) 2017, Wazuh Inc. (License GPLv2) services: wazuh.master: - image: wazuh/wazuh-manager:5.0.0-beta2 + image: wazuh/wazuh-manager:5.0.0 hostname: wazuh.master container_name: multi-node-wazuh.master restart: always @@ -43,7 +43,7 @@ services: - ./config/wazuh_master/certs/wazuh.master-key.pem:/var/wazuh-manager/etc/certs/manager-key.pem wazuh.worker: - image: wazuh/wazuh-manager:5.0.0-beta2 + image: wazuh/wazuh-manager:5.0.0 hostname: wazuh.worker container_name: multi-node-wazuh.worker restart: always @@ -82,7 +82,7 @@ services: - ./config/wazuh_worker/certs/wazuh.worker-key.pem:/var/wazuh-manager/etc/certs/manager-key.pem wazuh1.indexer: - image: wazuh/wazuh-indexer:5.0.0-beta2 + image: wazuh/wazuh-indexer:5.0.0 hostname: wazuh1.indexer container_name: multi-node-wazuh1.indexer restart: always @@ -120,7 +120,7 @@ services: - ./config/wazuh1_indexer/certs/admin-key.pem:/usr/share/wazuh-indexer/config/certs/admin-key.pem wazuh2.indexer: - image: wazuh/wazuh-indexer:5.0.0-beta2 + image: wazuh/wazuh-indexer:5.0.0 hostname: wazuh2.indexer container_name: multi-node-wazuh2.indexer restart: always @@ -158,7 +158,7 @@ services: - ./config/wazuh2_indexer/certs/wazuh2.indexer.pem:/usr/share/wazuh-indexer/config/certs/indexer.pem wazuh3.indexer: - image: wazuh/wazuh-indexer:5.0.0-beta2 + image: wazuh/wazuh-indexer:5.0.0 hostname: wazuh3.indexer container_name: multi-node-wazuh3.indexer restart: always @@ -196,7 +196,7 @@ services: - ./config/wazuh3_indexer/certs/wazuh3.indexer.pem:/usr/share/wazuh-indexer/config/certs/indexer.pem wazuh.dashboard: - image: wazuh/wazuh-dashboard:5.0.0-beta2 + image: wazuh/wazuh-dashboard:5.0.0 hostname: wazuh.dashboard container_name: multi-node-wazuh.dashboard restart: always diff --git a/single-node/docker-compose.yml b/single-node/docker-compose.yml index 044fede6..8365ed62 100644 --- a/single-node/docker-compose.yml +++ b/single-node/docker-compose.yml @@ -1,7 +1,7 @@ # Wazuh App Copyright (C) 2017, Wazuh Inc. (License GPLv2) services: wazuh.manager: - image: wazuh/wazuh-manager:5.0.0-beta2 + image: wazuh/wazuh-manager:5.0.0 hostname: wazuh.manager container_name: single-node-wazuh.manager restart: always @@ -43,7 +43,7 @@ services: - ./config/wazuh_manager/certs/wazuh.manager-key.pem:/var/wazuh-manager/etc/certs/manager-key.pem wazuh.indexer: - image: wazuh/wazuh-indexer:5.0.0-beta2 + image: wazuh/wazuh-indexer:5.0.0 hostname: wazuh.indexer container_name: single-node-wazuh.indexer restart: always @@ -80,7 +80,7 @@ services: - ./config/wazuh_indexer/certs/admin-key.pem:/usr/share/wazuh-indexer/config/certs/admin-key.pem wazuh.dashboard: - image: wazuh/wazuh-dashboard:5.0.0-beta2 + image: wazuh/wazuh-dashboard:5.0.0 hostname: wazuh.dashboard container_name: single-node-wazuh.dashboard restart: always diff --git a/wazuh-agent/docker-compose.yml b/wazuh-agent/docker-compose.yml index 0e7d14b4..842677e1 100644 --- a/wazuh-agent/docker-compose.yml +++ b/wazuh-agent/docker-compose.yml @@ -1,7 +1,7 @@ # Wazuh App Copyright (C) 2017, Wazuh Inc. (License GPLv2) services: wazuh.agent: - image: wazuh/wazuh-agent:5.0.0-beta2 + image: wazuh/wazuh-agent:5.0.0 restart: always environment: - WAZUH_MANAGER_SERVER=