From 8019e386bc2defc197548599792f36e8ca562cb8 Mon Sep 17 00:00:00 2001 From: vcerenu Date: Wed, 19 Jun 2024 10:20:28 -0300 Subject: [PATCH 01/16] Bump 4.10.0 version --- .env | 6 +++--- .github/.goss.yaml | 2 +- CHANGELOG.md | 5 +++++ README.md | 1 + VERSION | 4 ++-- build-docker-images/README.md | 4 ++-- build-docker-images/build-images.sh | 4 ++-- build-docker-images/wazuh-dashboard/config/config.sh | 4 ++-- build-docker-images/wazuh-indexer/config/config.sh | 4 ++-- indexer-certs-creator/config/entrypoint.sh | 4 ++-- multi-node/docker-compose.yml | 12 ++++++------ single-node/docker-compose.yml | 6 +++--- 12 files changed, 31 insertions(+), 25 deletions(-) diff --git a/.env b/.env index 8f5d52ff..84f7370e 100755 --- a/.env +++ b/.env @@ -1,6 +1,6 @@ -WAZUH_VERSION=4.9.0 -WAZUH_IMAGE_VERSION=4.9.0 +WAZUH_VERSION=4.10.0 +WAZUH_IMAGE_VERSION=4.10.0 WAZUH_TAG_REVISION=1 -FILEBEAT_TEMPLATE_BRANCH=4.9.0 +FILEBEAT_TEMPLATE_BRANCH=4.10.0 WAZUH_FILEBEAT_MODULE=wazuh-filebeat-0.4.tar.gz WAZUH_UI_REVISION=1 diff --git a/.github/.goss.yaml b/.github/.goss.yaml index a2ee17aa..41a65693 100644 --- a/.github/.goss.yaml +++ b/.github/.goss.yaml @@ -56,7 +56,7 @@ package: wazuh-manager: installed: true versions: - - 4.9.0-1 + - 4.10.0-1 port: tcp:1514: listening: true diff --git a/CHANGELOG.md b/CHANGELOG.md index 1d704b3b..c5fcc9a3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,11 @@ # Change Log All notable changes to this project will be documented in this file. +## Wazuh Docker v4.10.0 +### Added + +- Update Wazuh to version [4.10.0](https://github.com/wazuh/wazuh/blob/v4.10.0/CHANGELOG.md#v4100) + ## Wazuh Docker v4.9.0 ### Added diff --git a/README.md b/README.md index 7c6c3a3d..39b07e62 100644 --- a/README.md +++ b/README.md @@ -196,6 +196,7 @@ WAZUH_MONITORING_REPLICAS=0 ## | Wazuh version | ODFE | XPACK | |---------------|---------|--------| +| v4.10.0 | | | | v4.9.0 | | | | v4.8.2 | | | | v4.8.1 | | | diff --git a/VERSION b/VERSION index a25e5cee..d945595e 100644 --- a/VERSION +++ b/VERSION @@ -1,2 +1,2 @@ -WAZUH-DOCKER_VERSION="4.9.0" -REVISION="40900" +WAZUH-DOCKER_VERSION="4.10.0" +REVISION="41000" diff --git a/build-docker-images/README.md b/build-docker-images/README.md index d4c5b4ff..7541b7e6 100644 --- a/build-docker-images/README.md +++ b/build-docker-images/README.md @@ -13,7 +13,7 @@ This script initializes the environment variables needed to build each of the im The script allows you to build images from other versions of Wazuh, to do this you must use the -v or --version argument: ``` -$ build-docker-images/build-images.sh -v 4.9.0 +$ build-docker-images/build-images.sh -v 4.10.0 ``` To get all the available script options use the -h or --help option: @@ -26,7 +26,7 @@ Usage: build-docker-images/build-images.sh [OPTIONS] -d, --dev [Optional] Set the development stage you want to build, example rc1 or beta1, not used by default. -f, --filebeat-module [Optional] Set Filebeat module version. By default 0.4. -r, --revision [Optional] Package revision. By default 1 - -v, --version [Optional] Set the Wazuh version should be builded. By default, 4.9.0. + -v, --version [Optional] Set the Wazuh version should be builded. By default, 4.10.0. -h, --help Show this help. ``` \ No newline at end of file diff --git a/build-docker-images/build-images.sh b/build-docker-images/build-images.sh index 6d1833a8..e37066a7 100755 --- a/build-docker-images/build-images.sh +++ b/build-docker-images/build-images.sh @@ -1,4 +1,4 @@ -WAZUH_IMAGE_VERSION=4.9.0 +WAZUH_IMAGE_VERSION=4.10.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') @@ -12,7 +12,7 @@ IMAGE_VERSION=${WAZUH_IMAGE_VERSION} # License (version 2) as published by the FSF - Free Software # Foundation. -WAZUH_IMAGE_VERSION="4.9.0" +WAZUH_IMAGE_VERSION="4.10.0" WAZUH_TAG_REVISION="1" WAZUH_DEV_STAGE="" FILEBEAT_MODULE_VERSION="0.4" diff --git a/build-docker-images/wazuh-dashboard/config/config.sh b/build-docker-images/wazuh-dashboard/config/config.sh index 3f5dd902..4f833148 100644 --- a/build-docker-images/wazuh-dashboard/config/config.sh +++ b/build-docker-images/wazuh-dashboard/config/config.sh @@ -9,8 +9,8 @@ export CONFIG_DIR=${INSTALLATION_DIR}/config ## Variables CERT_TOOL=wazuh-certs-tool.sh -PACKAGES_URL=https://packages.wazuh.com/4.9/ -PACKAGES_DEV_URL=https://packages-dev.wazuh.com/4.9/ +PACKAGES_URL=https://packages.wazuh.com/4.10/ +PACKAGES_DEV_URL=https://packages-dev.wazuh.com/4.10/ ## Check if the cert tool exists in S3 buckets CERT_TOOL_PACKAGES=$(curl --silent -I $PACKAGES_URL$CERT_TOOL | grep -E "^HTTP" | awk '{print $2}') diff --git a/build-docker-images/wazuh-indexer/config/config.sh b/build-docker-images/wazuh-indexer/config/config.sh index 67e66fd7..2dd0a55a 100644 --- a/build-docker-images/wazuh-indexer/config/config.sh +++ b/build-docker-images/wazuh-indexer/config/config.sh @@ -53,8 +53,8 @@ tar -xf ${INDEXER_FILE} ## Variables CERT_TOOL=wazuh-certs-tool.sh PASSWORD_TOOL=wazuh-passwords-tool.sh -PACKAGES_URL=https://packages.wazuh.com/4.9/ -PACKAGES_DEV_URL=https://packages-dev.wazuh.com/4.9/ +PACKAGES_URL=https://packages.wazuh.com/4.10/ +PACKAGES_DEV_URL=https://packages-dev.wazuh.com/4.10/ ## Check if the cert tool exists in S3 buckets CERT_TOOL_PACKAGES=$(curl --silent -I $PACKAGES_URL$CERT_TOOL | grep -E "^HTTP" | awk '{print $2}') diff --git a/indexer-certs-creator/config/entrypoint.sh b/indexer-certs-creator/config/entrypoint.sh index db6e0e78..e8e95a13 100644 --- a/indexer-certs-creator/config/entrypoint.sh +++ b/indexer-certs-creator/config/entrypoint.sh @@ -8,8 +8,8 @@ ## Variables CERT_TOOL=wazuh-certs-tool.sh PASSWORD_TOOL=wazuh-passwords-tool.sh -PACKAGES_URL=https://packages.wazuh.com/4.9/ -PACKAGES_DEV_URL=https://packages-dev.wazuh.com/4.9/ +PACKAGES_URL=https://packages.wazuh.com/4.10/ +PACKAGES_DEV_URL=https://packages-dev.wazuh.com/4.10/ ## Check if the cert tool exists in S3 buckets CERT_TOOL_PACKAGES=$(curl --silent -I $PACKAGES_URL$CERT_TOOL | grep -E "^HTTP" | awk '{print $2}') diff --git a/multi-node/docker-compose.yml b/multi-node/docker-compose.yml index cdc62601..89e3741b 100644 --- a/multi-node/docker-compose.yml +++ b/multi-node/docker-compose.yml @@ -3,7 +3,7 @@ version: '3.7' services: wazuh.master: - image: wazuh/wazuh-manager:4.9.0 + image: wazuh/wazuh-manager:4.10.0 hostname: wazuh.master restart: always ulimits: @@ -45,7 +45,7 @@ services: - ./config/wazuh_cluster/wazuh_manager.conf:/wazuh-config-mount/etc/ossec.conf wazuh.worker: - image: wazuh/wazuh-manager:4.9.0 + image: wazuh/wazuh-manager:4.10.0 hostname: wazuh.worker restart: always ulimits: @@ -81,7 +81,7 @@ services: - ./config/wazuh_cluster/wazuh_worker.conf:/wazuh-config-mount/etc/ossec.conf wazuh1.indexer: - image: wazuh/wazuh-indexer:4.9.0 + image: wazuh/wazuh-indexer:4.10.0 hostname: wazuh1.indexer restart: always ports: @@ -107,7 +107,7 @@ services: - ./config/wazuh_indexer/internal_users.yml:/usr/share/wazuh-indexer/opensearch-security/internal_users.yml wazuh2.indexer: - image: wazuh/wazuh-indexer:4.9.0 + image: wazuh/wazuh-indexer:4.10.0 hostname: wazuh2.indexer restart: always environment: @@ -129,7 +129,7 @@ services: - ./config/wazuh_indexer/internal_users.yml:/usr/share/wazuh-indexer/opensearch-security/internal_users.yml wazuh3.indexer: - image: wazuh/wazuh-indexer:4.9.0 + image: wazuh/wazuh-indexer:4.10.0 hostname: wazuh3.indexer restart: always environment: @@ -151,7 +151,7 @@ services: - ./config/wazuh_indexer/internal_users.yml:/usr/share/wazuh-indexer/opensearch-security/internal_users.yml wazuh.dashboard: - image: wazuh/wazuh-dashboard:4.9.0 + image: wazuh/wazuh-dashboard:4.10.0 hostname: wazuh.dashboard restart: always ports: diff --git a/single-node/docker-compose.yml b/single-node/docker-compose.yml index 799c027a..a17a0368 100644 --- a/single-node/docker-compose.yml +++ b/single-node/docker-compose.yml @@ -3,7 +3,7 @@ version: '3.7' services: wazuh.manager: - image: wazuh/wazuh-manager:4.9.0 + image: wazuh/wazuh-manager:4.10.0 hostname: wazuh.manager restart: always ulimits: @@ -46,7 +46,7 @@ services: - ./config/wazuh_cluster/wazuh_manager.conf:/wazuh-config-mount/etc/ossec.conf wazuh.indexer: - image: wazuh/wazuh-indexer:4.9.0 + image: wazuh/wazuh-indexer:4.10.0 hostname: wazuh.indexer restart: always ports: @@ -71,7 +71,7 @@ services: - ./config/wazuh_indexer/internal_users.yml:/usr/share/wazuh-indexer/opensearch-security/internal_users.yml wazuh.dashboard: - image: wazuh/wazuh-dashboard:4.9.0 + image: wazuh/wazuh-dashboard:4.10.0 hostname: wazuh.dashboard restart: always ports: From 9c36a8a13b10c5d78463883db345420fda6ef208 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Anguita=20L=C3=B3pez?= Date: Thu, 4 Jul 2024 12:53:33 +0200 Subject: [PATCH 02/16] Removed references to modules because they are now enabled by default --- README.md | 14 -------------- build-docker-images/wazuh-dashboard/Dockerfile | 15 --------------- .../wazuh-dashboard/config/wazuh.yml | 17 +---------------- .../wazuh-dashboard/config/wazuh_app_config.sh | 15 --------------- 4 files changed, 1 insertion(+), 60 deletions(-) diff --git a/README.md b/README.md index 39b07e62..1abf606e 100644 --- a/README.md +++ b/README.md @@ -58,20 +58,6 @@ CHECKS_TEMPLATE=true # step once the Wazuh app starts. Values must be CHECKS_API=true CHECKS_SETUP=true -EXTENSIONS_PCI=true # Enable PCI Extension -EXTENSIONS_GDPR=true # Enable GDPR Extension -EXTENSIONS_HIPAA=true # Enable HIPAA Extension -EXTENSIONS_NIST=true # Enable NIST Extension -EXTENSIONS_TSC=true # Enable TSC Extension -EXTENSIONS_AUDIT=true # Enable Audit Extension -EXTENSIONS_OSCAP=false # Enable OpenSCAP Extension -EXTENSIONS_CISCAT=false # Enable CISCAT Extension -EXTENSIONS_AWS=false # Enable AWS Extension -EXTENSIONS_GCP=false # Enable GCP Extension -EXTENSIONS_VIRUSTOTAL=false # Enable Virustotal Extension -EXTENSIONS_OSQUERY=false # Enable OSQuery Extension -EXTENSIONS_DOCKER=false # Enable Docker Extension - APP_TIMEOUT=20000 # Defines maximum timeout to be used on the Wazuh app requests API_SELECTOR=true Defines if the user is allowed to change the selected API directly from the Wazuh app top menu diff --git a/build-docker-images/wazuh-dashboard/Dockerfile b/build-docker-images/wazuh-dashboard/Dockerfile index 51545c7c..71504bb9 100644 --- a/build-docker-images/wazuh-dashboard/Dockerfile +++ b/build-docker-images/wazuh-dashboard/Dockerfile @@ -56,21 +56,6 @@ ENV PATTERN="" \ CHECKS_TEMPLATE="" \ CHECKS_API="" \ CHECKS_SETUP="" \ - EXTENSIONS_PCI="" \ - EXTENSIONS_GDPR="" \ - EXTENSIONS_HIPAA="" \ - EXTENSIONS_NIST="" \ - EXTENSIONS_TSC="" \ - EXTENSIONS_AUDIT="" \ - EXTENSIONS_OSCAP="" \ - EXTENSIONS_CISCAT="" \ - EXTENSIONS_AWS="" \ - EXTENSIONS_GCP="" \ - EXTENSIONS_GITHUB=""\ - EXTENSIONS_OFFICE=""\ - EXTENSIONS_VIRUSTOTAL="" \ - EXTENSIONS_OSQUERY="" \ - EXTENSIONS_DOCKER="" \ APP_TIMEOUT="" \ API_SELECTOR="" \ IP_SELECTOR="" \ diff --git a/build-docker-images/wazuh-dashboard/config/wazuh.yml b/build-docker-images/wazuh-dashboard/config/wazuh.yml index 8e5f9447..cfb07502 100644 --- a/build-docker-images/wazuh-dashboard/config/wazuh.yml +++ b/build-docker-images/wazuh-dashboard/config/wazuh.yml @@ -35,22 +35,7 @@ # # --------------------------------- Extensions --------------------------------- # -# Defines which extensions should be activated when you add a new API entry. -# You can change them after Wazuh app starts. -# Values must to be true or false. -#extensions.pci : true -#extensions.gdpr : true -#extensions.hipaa : true -#extensions.nist : true -#extensions.tsc : true -#extensions.audit : true -#extensions.oscap : false -#extensions.ciscat : false -#extensions.aws : false -#extensions.gcp : false -#extensions.virustotal: false -#extensions.osquery : false -#extensions.docker : false +# All extensions are now enabled by default. # # ---------------------------------- Time out ---------------------------------- # diff --git a/build-docker-images/wazuh-dashboard/config/wazuh_app_config.sh b/build-docker-images/wazuh-dashboard/config/wazuh_app_config.sh index 4773d45d..76ecdc7f 100644 --- a/build-docker-images/wazuh-dashboard/config/wazuh_app_config.sh +++ b/build-docker-images/wazuh-dashboard/config/wazuh_app_config.sh @@ -15,21 +15,6 @@ declare -A CONFIG_MAP=( [checks.template]=$CHECKS_TEMPLATE [checks.api]=$CHECKS_API [checks.setup]=$CHECKS_SETUP - [extensions.pci]=$EXTENSIONS_PCI - [extensions.gdpr]=$EXTENSIONS_GDPR - [extensions.hipaa]=$EXTENSIONS_HIPAA - [extensions.nist]=$EXTENSIONS_NIST - [extensions.tsc]=$EXTENSIONS_TSC - [extensions.audit]=$EXTENSIONS_AUDIT - [extensions.oscap]=$EXTENSIONS_OSCAP - [extensions.ciscat]=$EXTENSIONS_CISCAT - [extensions.aws]=$EXTENSIONS_AWS - [extensions.gcp]=$EXTENSIONS_GCP - [extensions.github]=$EXTENSIONS_GITHUB - [extensions.office]=$EXTENSIONS_OFFICE - [extensions.virustotal]=$EXTENSIONS_VIRUSTOTAL - [extensions.osquery]=$EXTENSIONS_OSQUERY - [extensions.docker]=$EXTENSIONS_DOCKER [timeout]=$APP_TIMEOUT [api.selector]=$API_SELECTOR [ip.selector]=$IP_SELECTOR From f0253ba984ddeef0be26927445f59a9798d71621 Mon Sep 17 00:00:00 2001 From: "JESUS D. GARCIA" Date: Fri, 6 Sep 2024 11:49:07 -0500 Subject: [PATCH 03/16] Add Procedure_push_docker_images.yml workflow file --- .../Procedure_push_docker_images.yml | 34 +++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 .github/workflows/Procedure_push_docker_images.yml diff --git a/.github/workflows/Procedure_push_docker_images.yml b/.github/workflows/Procedure_push_docker_images.yml new file mode 100644 index 00000000..7f7bb30d --- /dev/null +++ b/.github/workflows/Procedure_push_docker_images.yml @@ -0,0 +1,34 @@ + +run-name: Launch Push Docker Images - Executed by @${{ github.actor }} +name: Push Docker Images + +on: + workflow_dispatch: + inputs: + JENKINS_REFERENCE: + description: 'wazuh-jenkins reference' + required: true + default: 'master' + IMAGE_TAG: + description: 'Docker image tag' + required: true + default: '4.10.0' + DOCKER_REFERENCE: + description: 'wazuh-docker reference' + required: true + default: '4.10.0' + PRODUCTS: + description: 'Comma-separated list of the image names to build and push' + default: 'wazuh-manager,wazuh-dashboard,wazuh-indexer' + required: true + FILEBEAT_MODULE_VERSION: + description: 'Filebeat module version' + required: true + REVISION: + description: 'Package revision' + required: true + PUSH_IMAGES: + description: 'Push images' + required: true + type: boolean + default: true \ No newline at end of file From b38b3c7e598dd22e54d3a6290950aa345966e053 Mon Sep 17 00:00:00 2001 From: "JESUS D. GARCIA" Date: Wed, 11 Sep 2024 18:40:31 -0500 Subject: [PATCH 04/16] * Update the Procedure push docker images workflow file * Handle the build process exit code properly --- .../Procedure_push_docker_images.yml | 98 +++++++++++++++++-- build-docker-images/build-images.sh | 2 +- 2 files changed, 90 insertions(+), 10 deletions(-) diff --git a/.github/workflows/Procedure_push_docker_images.yml b/.github/workflows/Procedure_push_docker_images.yml index 7f7bb30d..4dc4d0d4 100644 --- a/.github/workflows/Procedure_push_docker_images.yml +++ b/.github/workflows/Procedure_push_docker_images.yml @@ -1,22 +1,17 @@ - run-name: Launch Push Docker Images - Executed by @${{ github.actor }} name: Push Docker Images on: workflow_dispatch: inputs: - JENKINS_REFERENCE: - description: 'wazuh-jenkins reference' - required: true - default: 'master' IMAGE_TAG: description: 'Docker image tag' - required: true default: '4.10.0' + required: true DOCKER_REFERENCE: description: 'wazuh-docker reference' + default: 'v4.10.0' required: true - default: '4.10.0' PRODUCTS: description: 'Comma-separated list of the image names to build and push' default: 'wazuh-manager,wazuh-dashboard,wazuh-indexer' @@ -26,9 +21,94 @@ on: required: true REVISION: description: 'Package revision' + default: '1' required: true PUSH_IMAGES: description: 'Push images' - required: true type: boolean - default: true \ No newline at end of file + default: true + required: true + +jobs: + build-and-push: + runs-on: ubuntu-latest + + steps: + - name: Print inputs + run: | + echo "---------------------------------------------" + echo "Running Procedure_push_docker_images workflow" + echo "---------------------------------------------" + echo "* BRANCH: ${{ github.ref }}" + echo "* COMMIT: ${{ github.sha }}" + echo "---------------------------------------------" + echo "Inputs provided:" + echo "---------------------------------------------" + echo "* IMAGE_TAG: ${{ inputs.IMAGE_TAG }}" + echo "* DOCKER_REFERENCE: ${{ inputs.DOCKER_REFERENCE }}" + echo "* PRODUCTS: ${{ inputs.PRODUCTS }}" + echo "* FILEBEAT_MODULE_VERSION: ${{ inputs.FILEBEAT_MODULE_VERSION }}" + echo "* REVISION: ${{ inputs.REVISION }}" + echo "* PUSH_IMAGES: ${{ inputs.PUSH_IMAGES }}" + echo "---------------------------------------------" + + - name: Checkout repository + uses: actions/checkout@v4 + with: + ref: ${{ inputs.DOCKER_REFERENCE }} + + - name: Log in to Docker Hub + uses: docker/login-action@v3 + with: + username: wazuh + password: ${{ secrets.DOCKERHUB_PASSWORD }} + + - name: Install Docker Compose + run: | + sudo apt-get update + sudo apt-get install -y docker-compose + echo "Installed Docker Compose version: $(docker-compose --version)" + + - name: Build Wazuh images + run: | + IMAGE_TAG=${{ inputs.IMAGE_TAG }} + FILEBEAT_MODULE_VERSION=${{ inputs.FILEBEAT_MODULE_VERSION }} + REVISION=${{ inputs.REVISION }} + PUSH_IMAGES=${{ inputs.PUSH_IMAGES }} + + if [[ "$IMAGE_TAG" == *"-"* ]]; then + IFS='-' read -r -a tokens <<< "$IMAGE_TAG" + if [ -z "${tokens[1]}" ]; then + echo "Invalid image tag: $IMAGE_TAG" + exit 1 + fi + DEV_STAGE=${tokens[1]} + WAZUH_VER=${tokens[0]} + ./build-docker-images/build-images.sh -v $WAZUH_VER -r $REVISION -d $DEV_STAGE -f $FILEBEAT_MODULE_VERSION + else + ./build-docker-images/build-images.sh -v $IMAGE_TAG -r $REVISION -f $FILEBEAT_MODULE_VERSION + fi + + ENV_FILE_PATH=".env" + # Save .env file contents to $GITHUB_ENV + if [ -f $ENV_FILE_PATH ]; then + while IFS= read -r line || [ -n "$line" ]; do + echo "$line" >> $GITHUB_ENV + done < $ENV_FILE_PATH + else + echo "The environment file $ENV_FILE_PATH does not exist!" + exit 1 + fi + + + - name: Tag and Push Wazuh images + if: ${{ inputs.PUSH_IMAGES }} + run: | + IMAGE_TAG=${{ inputs.IMAGE_TAG }} + IMAGE_NAMES=${{ inputs.PRODUCTS }} + IFS=',' read -r -a images <<< "$IMAGE_NAMES" + for image in "${images[@]}"; do + echo "Tagging and pushing wazuh/$image:${WAZUH_VERSION} to wazuh/$image:$IMAGE_TAG" + docker tag wazuh/$image:${WAZUH_VERSION} wazuh/$image:$IMAGE_TAG + docker push wazuh/$image:$IMAGE_TAG + done \ No newline at end of file diff --git a/build-docker-images/build-images.sh b/build-docker-images/build-images.sh index e37066a7..6a7b3f8a 100755 --- a/build-docker-images/build-images.sh +++ b/build-docker-images/build-images.sh @@ -70,7 +70,7 @@ build() { echo WAZUH_FILEBEAT_MODULE=$WAZUH_FILEBEAT_MODULE >> .env echo WAZUH_UI_REVISION=$WAZUH_UI_REVISION >> .env - docker-compose -f build-docker-images/build-images.yml --env-file .env build --no-cache + docker-compose -f build-docker-images/build-images.yml --env-file .env build --no-cache || clean 1 return 0 } From 471aedae5b926c86e7144c10c151da5cc54c5ee4 Mon Sep 17 00:00:00 2001 From: "JESUS D. GARCIA" Date: Fri, 13 Sep 2024 11:15:04 -0500 Subject: [PATCH 05/16] Update changelog --- .github/workflows/Procedure_push_docker_images.yml | 2 +- CHANGELOG.md | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/Procedure_push_docker_images.yml b/.github/workflows/Procedure_push_docker_images.yml index 4dc4d0d4..79a813df 100644 --- a/.github/workflows/Procedure_push_docker_images.yml +++ b/.github/workflows/Procedure_push_docker_images.yml @@ -111,4 +111,4 @@ jobs: echo "Tagging and pushing wazuh/$image:${WAZUH_VERSION} to wazuh/$image:$IMAGE_TAG" docker tag wazuh/$image:${WAZUH_VERSION} wazuh/$image:$IMAGE_TAG docker push wazuh/$image:$IMAGE_TAG - done \ No newline at end of file + done diff --git a/CHANGELOG.md b/CHANGELOG.md index 36a4abe8..6e268497 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,7 @@ All notable changes to this project will be documented in this file. ## Wazuh Docker v4.10.0 ### Added +- Migrate the push docker images procedure to GitHub Actions ([#5651](https://github.com/wazuh/wazuh-qa/issues/5651)) - Update Wazuh to version [4.10.0](https://github.com/wazuh/wazuh/blob/v4.10.0/CHANGELOG.md#v4100) ## Wazuh Docker v4.9.1 From 42db7176683eb23f09d2a6555d0c7d9b8db81b39 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Correa=20Rodr=C3=ADguez?= Date: Tue, 24 Sep 2024 08:50:11 +0200 Subject: [PATCH 06/16] Bumped revision for 4.10.0-alpha1 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index d945595e..aa7932ba 100644 --- a/VERSION +++ b/VERSION @@ -1,2 +1,2 @@ WAZUH-DOCKER_VERSION="4.10.0" -REVISION="41000" +REVISION="41001" From 8ab3018e62a74a27b2cead9b94301279667909a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Correa=20Rodr=C3=ADguez?= Date: Tue, 24 Sep 2024 09:28:31 +0200 Subject: [PATCH 07/16] Changed image tag for 4.10.0-alpha1 --- multi-node/docker-compose.yml | 12 ++++++------ single-node/docker-compose.yml | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/multi-node/docker-compose.yml b/multi-node/docker-compose.yml index 89e3741b..a4e68876 100644 --- a/multi-node/docker-compose.yml +++ b/multi-node/docker-compose.yml @@ -3,7 +3,7 @@ version: '3.7' services: wazuh.master: - image: wazuh/wazuh-manager:4.10.0 + image: wazuh/wazuh-manager:4.10.0-alpha1 hostname: wazuh.master restart: always ulimits: @@ -45,7 +45,7 @@ services: - ./config/wazuh_cluster/wazuh_manager.conf:/wazuh-config-mount/etc/ossec.conf wazuh.worker: - image: wazuh/wazuh-manager:4.10.0 + image: wazuh/wazuh-manager:4.10.0-alpha1 hostname: wazuh.worker restart: always ulimits: @@ -81,7 +81,7 @@ services: - ./config/wazuh_cluster/wazuh_worker.conf:/wazuh-config-mount/etc/ossec.conf wazuh1.indexer: - image: wazuh/wazuh-indexer:4.10.0 + image: wazuh/wazuh-indexer:4.10.0-alpha1 hostname: wazuh1.indexer restart: always ports: @@ -107,7 +107,7 @@ services: - ./config/wazuh_indexer/internal_users.yml:/usr/share/wazuh-indexer/opensearch-security/internal_users.yml wazuh2.indexer: - image: wazuh/wazuh-indexer:4.10.0 + image: wazuh/wazuh-indexer:4.10.0-alpha1 hostname: wazuh2.indexer restart: always environment: @@ -129,7 +129,7 @@ services: - ./config/wazuh_indexer/internal_users.yml:/usr/share/wazuh-indexer/opensearch-security/internal_users.yml wazuh3.indexer: - image: wazuh/wazuh-indexer:4.10.0 + image: wazuh/wazuh-indexer:4.10.0-alpha1 hostname: wazuh3.indexer restart: always environment: @@ -151,7 +151,7 @@ services: - ./config/wazuh_indexer/internal_users.yml:/usr/share/wazuh-indexer/opensearch-security/internal_users.yml wazuh.dashboard: - image: wazuh/wazuh-dashboard:4.10.0 + image: wazuh/wazuh-dashboard:4.10.0-alpha1 hostname: wazuh.dashboard restart: always ports: diff --git a/single-node/docker-compose.yml b/single-node/docker-compose.yml index a17a0368..75b27830 100644 --- a/single-node/docker-compose.yml +++ b/single-node/docker-compose.yml @@ -3,7 +3,7 @@ version: '3.7' services: wazuh.manager: - image: wazuh/wazuh-manager:4.10.0 + image: wazuh/wazuh-manager:4.10.0-alpha1 hostname: wazuh.manager restart: always ulimits: @@ -46,7 +46,7 @@ services: - ./config/wazuh_cluster/wazuh_manager.conf:/wazuh-config-mount/etc/ossec.conf wazuh.indexer: - image: wazuh/wazuh-indexer:4.10.0 + image: wazuh/wazuh-indexer:4.10.0-alpha1 hostname: wazuh.indexer restart: always ports: @@ -71,7 +71,7 @@ services: - ./config/wazuh_indexer/internal_users.yml:/usr/share/wazuh-indexer/opensearch-security/internal_users.yml wazuh.dashboard: - image: wazuh/wazuh-dashboard:4.10.0 + image: wazuh/wazuh-dashboard:4.10.0-alpha1 hostname: wazuh.dashboard restart: always ports: From 9e1c33245d21f0b05c00b05e6078c04ae8fd4e47 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Correa=20Rodr=C3=ADguez?= Date: Tue, 24 Sep 2024 09:32:47 +0200 Subject: [PATCH 08/16] Reverted image tag for 4.10.0-alpha1 --- multi-node/docker-compose.yml | 12 ++++++------ single-node/docker-compose.yml | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/multi-node/docker-compose.yml b/multi-node/docker-compose.yml index a4e68876..89e3741b 100644 --- a/multi-node/docker-compose.yml +++ b/multi-node/docker-compose.yml @@ -3,7 +3,7 @@ version: '3.7' services: wazuh.master: - image: wazuh/wazuh-manager:4.10.0-alpha1 + image: wazuh/wazuh-manager:4.10.0 hostname: wazuh.master restart: always ulimits: @@ -45,7 +45,7 @@ services: - ./config/wazuh_cluster/wazuh_manager.conf:/wazuh-config-mount/etc/ossec.conf wazuh.worker: - image: wazuh/wazuh-manager:4.10.0-alpha1 + image: wazuh/wazuh-manager:4.10.0 hostname: wazuh.worker restart: always ulimits: @@ -81,7 +81,7 @@ services: - ./config/wazuh_cluster/wazuh_worker.conf:/wazuh-config-mount/etc/ossec.conf wazuh1.indexer: - image: wazuh/wazuh-indexer:4.10.0-alpha1 + image: wazuh/wazuh-indexer:4.10.0 hostname: wazuh1.indexer restart: always ports: @@ -107,7 +107,7 @@ services: - ./config/wazuh_indexer/internal_users.yml:/usr/share/wazuh-indexer/opensearch-security/internal_users.yml wazuh2.indexer: - image: wazuh/wazuh-indexer:4.10.0-alpha1 + image: wazuh/wazuh-indexer:4.10.0 hostname: wazuh2.indexer restart: always environment: @@ -129,7 +129,7 @@ services: - ./config/wazuh_indexer/internal_users.yml:/usr/share/wazuh-indexer/opensearch-security/internal_users.yml wazuh3.indexer: - image: wazuh/wazuh-indexer:4.10.0-alpha1 + image: wazuh/wazuh-indexer:4.10.0 hostname: wazuh3.indexer restart: always environment: @@ -151,7 +151,7 @@ services: - ./config/wazuh_indexer/internal_users.yml:/usr/share/wazuh-indexer/opensearch-security/internal_users.yml wazuh.dashboard: - image: wazuh/wazuh-dashboard:4.10.0-alpha1 + image: wazuh/wazuh-dashboard:4.10.0 hostname: wazuh.dashboard restart: always ports: diff --git a/single-node/docker-compose.yml b/single-node/docker-compose.yml index 75b27830..a17a0368 100644 --- a/single-node/docker-compose.yml +++ b/single-node/docker-compose.yml @@ -3,7 +3,7 @@ version: '3.7' services: wazuh.manager: - image: wazuh/wazuh-manager:4.10.0-alpha1 + image: wazuh/wazuh-manager:4.10.0 hostname: wazuh.manager restart: always ulimits: @@ -46,7 +46,7 @@ services: - ./config/wazuh_cluster/wazuh_manager.conf:/wazuh-config-mount/etc/ossec.conf wazuh.indexer: - image: wazuh/wazuh-indexer:4.10.0-alpha1 + image: wazuh/wazuh-indexer:4.10.0 hostname: wazuh.indexer restart: always ports: @@ -71,7 +71,7 @@ services: - ./config/wazuh_indexer/internal_users.yml:/usr/share/wazuh-indexer/opensearch-security/internal_users.yml wazuh.dashboard: - image: wazuh/wazuh-dashboard:4.10.0-alpha1 + image: wazuh/wazuh-dashboard:4.10.0 hostname: wazuh.dashboard restart: always ports: From 027b26047f6bc862329e880b75b1c6c9c86955d9 Mon Sep 17 00:00:00 2001 From: "JESUS D. GARCIA" Date: Mon, 30 Sep 2024 16:20:31 -0500 Subject: [PATCH 09/16] Update Procedure_push_docker_images.yml --- .../Procedure_push_docker_images.yml | 103 +++++++++++++----- 1 file changed, 78 insertions(+), 25 deletions(-) diff --git a/.github/workflows/Procedure_push_docker_images.yml b/.github/workflows/Procedure_push_docker_images.yml index 79a813df..c27ae5d0 100644 --- a/.github/workflows/Procedure_push_docker_images.yml +++ b/.github/workflows/Procedure_push_docker_images.yml @@ -1,33 +1,84 @@ -run-name: Launch Push Docker Images - Executed by @${{ github.actor }} +run-name: Launch Push Docker Images - ${{ inputs.id }} name: Push Docker Images on: workflow_dispatch: inputs: - IMAGE_TAG: + image_tag: description: 'Docker image tag' default: '4.10.0' required: true - DOCKER_REFERENCE: + docker_reference: description: 'wazuh-docker reference' default: 'v4.10.0' - required: true - PRODUCTS: + required: false + products: description: 'Comma-separated list of the image names to build and push' default: 'wazuh-manager,wazuh-dashboard,wazuh-indexer' required: true - FILEBEAT_MODULE_VERSION: + filebeat_module_version: description: 'Filebeat module version' + default: '0.4' required: true - REVISION: + revision: description: 'Package revision' default: '1' required: true - PUSH_IMAGES: + push_images: description: 'Push images' type: boolean default: true required: true + id: + description: "ID used to identify the workflow uniquely." + type: string + required: false + dev: + description: "Add tag suffix '-dev' to the image tag ?" + type: boolean + default: false + required: false + workflow_call: + inputs: + image_tag: + description: 'Docker image tag' + default: '4.10.0' + required: true + type: string + docker_reference: + description: 'wazuh-docker reference' + default: 'v4.10.0' + required: false + type: string + products: + description: 'Comma-separated list of the image names to build and push' + default: 'wazuh-manager,wazuh-dashboard,wazuh-indexer' + required: true + type: string + filebeat_module_version: + description: 'Filebeat module version' + default: '0.4' + required: true + type: string + revision: + description: 'Package revision' + default: '1' + required: true + type: string + push_images: + description: 'Push images' + type: boolean + default: true + required: true + id: + description: "ID used to identify the workflow uniquely." + type: string + required: false + dev: + description: "Add tag suffix '-dev' to the image tag ?" + type: boolean + default: false + required: false jobs: build-and-push: @@ -44,23 +95,25 @@ jobs: echo "---------------------------------------------" echo "Inputs provided:" echo "---------------------------------------------" - echo "* IMAGE_TAG: ${{ inputs.IMAGE_TAG }}" - echo "* DOCKER_REFERENCE: ${{ inputs.DOCKER_REFERENCE }}" - echo "* PRODUCTS: ${{ inputs.PRODUCTS }}" - echo "* FILEBEAT_MODULE_VERSION: ${{ inputs.FILEBEAT_MODULE_VERSION }}" - echo "* REVISION: ${{ inputs.REVISION }}" - echo "* PUSH_IMAGES: ${{ inputs.PUSH_IMAGES }}" + echo "* id: ${{ inputs.id }}" + echo "* image_tag: ${{ inputs.image_tag }}" + echo "* docker_reference: ${{ inputs.docker_reference }}" + echo "* products: ${{ inputs.products }}" + echo "* filebeat_module_version: ${{ inputs.filebeat_module_version }}" + echo "* revision: ${{ inputs.revision }}" + echo "* push_images: ${{ inputs.push_images }}" + echo "* dev: ${{ inputs.dev }}" echo "---------------------------------------------" - name: Checkout repository uses: actions/checkout@v4 with: - ref: ${{ inputs.DOCKER_REFERENCE }} + ref: ${{ inputs.docker_reference }} - name: Log in to Docker Hub uses: docker/login-action@v3 with: - username: wazuh + username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_PASSWORD }} - name: Install Docker Compose @@ -71,10 +124,9 @@ jobs: - name: Build Wazuh images run: | - IMAGE_TAG=${{ inputs.IMAGE_TAG }} - FILEBEAT_MODULE_VERSION=${{ inputs.FILEBEAT_MODULE_VERSION }} - REVISION=${{ inputs.REVISION }} - PUSH_IMAGES=${{ inputs.PUSH_IMAGES }} + IMAGE_TAG=${{ inputs.image_tag }} + FILEBEAT_MODULE_VERSION=${{ inputs.filebeat_module_version }} + REVISION=${{ inputs.revision }} if [[ "$IMAGE_TAG" == *"-"* ]]; then IFS='-' read -r -a tokens <<< "$IMAGE_TAG" @@ -89,8 +141,9 @@ jobs: ./build-docker-images/build-images.sh -v $IMAGE_TAG -r $REVISION -f $FILEBEAT_MODULE_VERSION fi + # Save .env file (generated by build-images.sh) contents to $GITHUB_ENV ENV_FILE_PATH=".env" - # Save .env file contents to $GITHUB_ENV + if [ -f $ENV_FILE_PATH ]; then while IFS= read -r line || [ -n "$line" ]; do echo "$line" >> $GITHUB_ENV @@ -100,15 +153,15 @@ jobs: exit 1 fi - - name: Tag and Push Wazuh images - if: ${{ inputs.PUSH_IMAGES }} + if: ${{ inputs.push_images }} run: | - IMAGE_TAG=${{ inputs.IMAGE_TAG }} - IMAGE_NAMES=${{ inputs.PRODUCTS }} + IMAGE_TAG="${{ inputs.image_tag }}$( [ "${{ inputs.dev }}" == "true" ] && echo '-dev' || true )" + IMAGE_NAMES=${{ inputs.products }} IFS=',' read -r -a images <<< "$IMAGE_NAMES" for image in "${images[@]}"; do echo "Tagging and pushing wazuh/$image:${WAZUH_VERSION} to wazuh/$image:$IMAGE_TAG" docker tag wazuh/$image:${WAZUH_VERSION} wazuh/$image:$IMAGE_TAG + echo "Pushing wazuh/$image:$IMAGE_TAG ..." docker push wazuh/$image:$IMAGE_TAG done From 8bafe1295b4314fa55043bd81df83a5632806736 Mon Sep 17 00:00:00 2001 From: "JESUS D. GARCIA" Date: Tue, 1 Oct 2024 10:06:13 -0500 Subject: [PATCH 10/16] Change the dev default value to true for the workflow_dispatch --- .github/workflows/Procedure_push_docker_images.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/Procedure_push_docker_images.yml b/.github/workflows/Procedure_push_docker_images.yml index c27ae5d0..7ff8033d 100644 --- a/.github/workflows/Procedure_push_docker_images.yml +++ b/.github/workflows/Procedure_push_docker_images.yml @@ -36,7 +36,7 @@ on: dev: description: "Add tag suffix '-dev' to the image tag ?" type: boolean - default: false + default: true required: false workflow_call: inputs: From dbb776690d126c8f7845f3e27ca90fdcdf81aefa Mon Sep 17 00:00:00 2001 From: "JESUS D. GARCIA" Date: Thu, 10 Oct 2024 10:43:13 -0500 Subject: [PATCH 11/16] Bump revision --- CHANGELOG.md | 16 ++++++++++++++-- VERSION | 2 +- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6e268497..5086a476 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,11 +1,23 @@ # Change Log All notable changes to this project will be documented in this file. -## Wazuh Docker v4.10.0 +## [4.10.0] + ### Added - Migrate the push docker images procedure to GitHub Actions ([#5651](https://github.com/wazuh/wazuh-qa/issues/5651)) -- Update Wazuh to version [4.10.0](https://github.com/wazuh/wazuh/blob/v4.10.0/CHANGELOG.md#v4100) + +### Changed + +- None + +### Fixed + +- None + +### Deleted + +- None ## Wazuh Docker v4.9.1 ### Added diff --git a/VERSION b/VERSION index aa7932ba..9df77192 100644 --- a/VERSION +++ b/VERSION @@ -1,2 +1,2 @@ WAZUH-DOCKER_VERSION="4.10.0" -REVISION="41001" +REVISION="41002" From db4133d7a8ac3bb59e402cb0b970bd54017714be Mon Sep 17 00:00:00 2001 From: "JESUS D. GARCIA" Date: Thu, 10 Oct 2024 10:54:04 -0500 Subject: [PATCH 12/16] Update docker-compose versions --- multi-node/docker-compose.yml | 12 ++++++------ single-node/docker-compose.yml | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/multi-node/docker-compose.yml b/multi-node/docker-compose.yml index 89e3741b..bb5bb3cd 100644 --- a/multi-node/docker-compose.yml +++ b/multi-node/docker-compose.yml @@ -3,7 +3,7 @@ version: '3.7' services: wazuh.master: - image: wazuh/wazuh-manager:4.10.0 + image: wazuh/wazuh-manager:4.10.0-alpha2 hostname: wazuh.master restart: always ulimits: @@ -45,7 +45,7 @@ services: - ./config/wazuh_cluster/wazuh_manager.conf:/wazuh-config-mount/etc/ossec.conf wazuh.worker: - image: wazuh/wazuh-manager:4.10.0 + image: wazuh/wazuh-manager:4.10.0-alpha2 hostname: wazuh.worker restart: always ulimits: @@ -81,7 +81,7 @@ services: - ./config/wazuh_cluster/wazuh_worker.conf:/wazuh-config-mount/etc/ossec.conf wazuh1.indexer: - image: wazuh/wazuh-indexer:4.10.0 + image: wazuh/wazuh-indexer:4.10.0-alpha2 hostname: wazuh1.indexer restart: always ports: @@ -107,7 +107,7 @@ services: - ./config/wazuh_indexer/internal_users.yml:/usr/share/wazuh-indexer/opensearch-security/internal_users.yml wazuh2.indexer: - image: wazuh/wazuh-indexer:4.10.0 + image: wazuh/wazuh-indexer:4.10.0-alpha2 hostname: wazuh2.indexer restart: always environment: @@ -129,7 +129,7 @@ services: - ./config/wazuh_indexer/internal_users.yml:/usr/share/wazuh-indexer/opensearch-security/internal_users.yml wazuh3.indexer: - image: wazuh/wazuh-indexer:4.10.0 + image: wazuh/wazuh-indexer:4.10.0-alpha2 hostname: wazuh3.indexer restart: always environment: @@ -151,7 +151,7 @@ services: - ./config/wazuh_indexer/internal_users.yml:/usr/share/wazuh-indexer/opensearch-security/internal_users.yml wazuh.dashboard: - image: wazuh/wazuh-dashboard:4.10.0 + image: wazuh/wazuh-dashboard:4.10.0-alpha2 hostname: wazuh.dashboard restart: always ports: diff --git a/single-node/docker-compose.yml b/single-node/docker-compose.yml index a17a0368..995362c0 100644 --- a/single-node/docker-compose.yml +++ b/single-node/docker-compose.yml @@ -3,7 +3,7 @@ version: '3.7' services: wazuh.manager: - image: wazuh/wazuh-manager:4.10.0 + image: wazuh/wazuh-manager:4.10.0-alpha2 hostname: wazuh.manager restart: always ulimits: @@ -46,7 +46,7 @@ services: - ./config/wazuh_cluster/wazuh_manager.conf:/wazuh-config-mount/etc/ossec.conf wazuh.indexer: - image: wazuh/wazuh-indexer:4.10.0 + image: wazuh/wazuh-indexer:4.10.0-alpha2 hostname: wazuh.indexer restart: always ports: @@ -71,7 +71,7 @@ services: - ./config/wazuh_indexer/internal_users.yml:/usr/share/wazuh-indexer/opensearch-security/internal_users.yml wazuh.dashboard: - image: wazuh/wazuh-dashboard:4.10.0 + image: wazuh/wazuh-dashboard:4.10.0-alpha2 hostname: wazuh.dashboard restart: always ports: From 5795fa154dd5c1e6a5b68e2046ac862e854ff20c Mon Sep 17 00:00:00 2001 From: "JESUS D. GARCIA" Date: Thu, 10 Oct 2024 11:10:29 -0500 Subject: [PATCH 13/16] Revert image tag to 4.10.0 --- multi-node/docker-compose.yml | 12 ++++++------ single-node/docker-compose.yml | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/multi-node/docker-compose.yml b/multi-node/docker-compose.yml index bb5bb3cd..89e3741b 100644 --- a/multi-node/docker-compose.yml +++ b/multi-node/docker-compose.yml @@ -3,7 +3,7 @@ version: '3.7' services: wazuh.master: - image: wazuh/wazuh-manager:4.10.0-alpha2 + image: wazuh/wazuh-manager:4.10.0 hostname: wazuh.master restart: always ulimits: @@ -45,7 +45,7 @@ services: - ./config/wazuh_cluster/wazuh_manager.conf:/wazuh-config-mount/etc/ossec.conf wazuh.worker: - image: wazuh/wazuh-manager:4.10.0-alpha2 + image: wazuh/wazuh-manager:4.10.0 hostname: wazuh.worker restart: always ulimits: @@ -81,7 +81,7 @@ services: - ./config/wazuh_cluster/wazuh_worker.conf:/wazuh-config-mount/etc/ossec.conf wazuh1.indexer: - image: wazuh/wazuh-indexer:4.10.0-alpha2 + image: wazuh/wazuh-indexer:4.10.0 hostname: wazuh1.indexer restart: always ports: @@ -107,7 +107,7 @@ services: - ./config/wazuh_indexer/internal_users.yml:/usr/share/wazuh-indexer/opensearch-security/internal_users.yml wazuh2.indexer: - image: wazuh/wazuh-indexer:4.10.0-alpha2 + image: wazuh/wazuh-indexer:4.10.0 hostname: wazuh2.indexer restart: always environment: @@ -129,7 +129,7 @@ services: - ./config/wazuh_indexer/internal_users.yml:/usr/share/wazuh-indexer/opensearch-security/internal_users.yml wazuh3.indexer: - image: wazuh/wazuh-indexer:4.10.0-alpha2 + image: wazuh/wazuh-indexer:4.10.0 hostname: wazuh3.indexer restart: always environment: @@ -151,7 +151,7 @@ services: - ./config/wazuh_indexer/internal_users.yml:/usr/share/wazuh-indexer/opensearch-security/internal_users.yml wazuh.dashboard: - image: wazuh/wazuh-dashboard:4.10.0-alpha2 + image: wazuh/wazuh-dashboard:4.10.0 hostname: wazuh.dashboard restart: always ports: diff --git a/single-node/docker-compose.yml b/single-node/docker-compose.yml index 995362c0..a17a0368 100644 --- a/single-node/docker-compose.yml +++ b/single-node/docker-compose.yml @@ -3,7 +3,7 @@ version: '3.7' services: wazuh.manager: - image: wazuh/wazuh-manager:4.10.0-alpha2 + image: wazuh/wazuh-manager:4.10.0 hostname: wazuh.manager restart: always ulimits: @@ -46,7 +46,7 @@ services: - ./config/wazuh_cluster/wazuh_manager.conf:/wazuh-config-mount/etc/ossec.conf wazuh.indexer: - image: wazuh/wazuh-indexer:4.10.0-alpha2 + image: wazuh/wazuh-indexer:4.10.0 hostname: wazuh.indexer restart: always ports: @@ -71,7 +71,7 @@ services: - ./config/wazuh_indexer/internal_users.yml:/usr/share/wazuh-indexer/opensearch-security/internal_users.yml wazuh.dashboard: - image: wazuh/wazuh-dashboard:4.10.0-alpha2 + image: wazuh/wazuh-dashboard:4.10.0 hostname: wazuh.dashboard restart: always ports: From 02074c678e5b2d6057372fbb2bc97bdeb7ae643e Mon Sep 17 00:00:00 2001 From: Enrique Araque Date: Fri, 18 Oct 2024 10:43:01 +0200 Subject: [PATCH 14/16] Bump revision to 41003 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 9df77192..6338a2e8 100644 --- a/VERSION +++ b/VERSION @@ -1,2 +1,2 @@ WAZUH-DOCKER_VERSION="4.10.0" -REVISION="41002" +REVISION="41003" From 041cea8a9a6bbe1da9babd9d2b691adb3a50f284 Mon Sep 17 00:00:00 2001 From: Enrique Araque Date: Fri, 18 Oct 2024 10:50:04 +0200 Subject: [PATCH 15/16] Add alpha2 to docker 4.10.0 images --- multi-node/docker-compose.yml | 12 ++++++------ single-node/docker-compose.yml | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/multi-node/docker-compose.yml b/multi-node/docker-compose.yml index 89e3741b..bb5bb3cd 100644 --- a/multi-node/docker-compose.yml +++ b/multi-node/docker-compose.yml @@ -3,7 +3,7 @@ version: '3.7' services: wazuh.master: - image: wazuh/wazuh-manager:4.10.0 + image: wazuh/wazuh-manager:4.10.0-alpha2 hostname: wazuh.master restart: always ulimits: @@ -45,7 +45,7 @@ services: - ./config/wazuh_cluster/wazuh_manager.conf:/wazuh-config-mount/etc/ossec.conf wazuh.worker: - image: wazuh/wazuh-manager:4.10.0 + image: wazuh/wazuh-manager:4.10.0-alpha2 hostname: wazuh.worker restart: always ulimits: @@ -81,7 +81,7 @@ services: - ./config/wazuh_cluster/wazuh_worker.conf:/wazuh-config-mount/etc/ossec.conf wazuh1.indexer: - image: wazuh/wazuh-indexer:4.10.0 + image: wazuh/wazuh-indexer:4.10.0-alpha2 hostname: wazuh1.indexer restart: always ports: @@ -107,7 +107,7 @@ services: - ./config/wazuh_indexer/internal_users.yml:/usr/share/wazuh-indexer/opensearch-security/internal_users.yml wazuh2.indexer: - image: wazuh/wazuh-indexer:4.10.0 + image: wazuh/wazuh-indexer:4.10.0-alpha2 hostname: wazuh2.indexer restart: always environment: @@ -129,7 +129,7 @@ services: - ./config/wazuh_indexer/internal_users.yml:/usr/share/wazuh-indexer/opensearch-security/internal_users.yml wazuh3.indexer: - image: wazuh/wazuh-indexer:4.10.0 + image: wazuh/wazuh-indexer:4.10.0-alpha2 hostname: wazuh3.indexer restart: always environment: @@ -151,7 +151,7 @@ services: - ./config/wazuh_indexer/internal_users.yml:/usr/share/wazuh-indexer/opensearch-security/internal_users.yml wazuh.dashboard: - image: wazuh/wazuh-dashboard:4.10.0 + image: wazuh/wazuh-dashboard:4.10.0-alpha2 hostname: wazuh.dashboard restart: always ports: diff --git a/single-node/docker-compose.yml b/single-node/docker-compose.yml index a17a0368..995362c0 100644 --- a/single-node/docker-compose.yml +++ b/single-node/docker-compose.yml @@ -3,7 +3,7 @@ version: '3.7' services: wazuh.manager: - image: wazuh/wazuh-manager:4.10.0 + image: wazuh/wazuh-manager:4.10.0-alpha2 hostname: wazuh.manager restart: always ulimits: @@ -46,7 +46,7 @@ services: - ./config/wazuh_cluster/wazuh_manager.conf:/wazuh-config-mount/etc/ossec.conf wazuh.indexer: - image: wazuh/wazuh-indexer:4.10.0 + image: wazuh/wazuh-indexer:4.10.0-alpha2 hostname: wazuh.indexer restart: always ports: @@ -71,7 +71,7 @@ services: - ./config/wazuh_indexer/internal_users.yml:/usr/share/wazuh-indexer/opensearch-security/internal_users.yml wazuh.dashboard: - image: wazuh/wazuh-dashboard:4.10.0 + image: wazuh/wazuh-dashboard:4.10.0-alpha2 hostname: wazuh.dashboard restart: always ports: From 93ea37158db19fce3844223a189ffa40d9ee8fed Mon Sep 17 00:00:00 2001 From: Enrique Araque Date: Fri, 18 Oct 2024 10:59:10 +0200 Subject: [PATCH 16/16] Revert image tag for 4.10.0-alpha2 --- multi-node/docker-compose.yml | 12 ++++++------ single-node/docker-compose.yml | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/multi-node/docker-compose.yml b/multi-node/docker-compose.yml index bb5bb3cd..89e3741b 100644 --- a/multi-node/docker-compose.yml +++ b/multi-node/docker-compose.yml @@ -3,7 +3,7 @@ version: '3.7' services: wazuh.master: - image: wazuh/wazuh-manager:4.10.0-alpha2 + image: wazuh/wazuh-manager:4.10.0 hostname: wazuh.master restart: always ulimits: @@ -45,7 +45,7 @@ services: - ./config/wazuh_cluster/wazuh_manager.conf:/wazuh-config-mount/etc/ossec.conf wazuh.worker: - image: wazuh/wazuh-manager:4.10.0-alpha2 + image: wazuh/wazuh-manager:4.10.0 hostname: wazuh.worker restart: always ulimits: @@ -81,7 +81,7 @@ services: - ./config/wazuh_cluster/wazuh_worker.conf:/wazuh-config-mount/etc/ossec.conf wazuh1.indexer: - image: wazuh/wazuh-indexer:4.10.0-alpha2 + image: wazuh/wazuh-indexer:4.10.0 hostname: wazuh1.indexer restart: always ports: @@ -107,7 +107,7 @@ services: - ./config/wazuh_indexer/internal_users.yml:/usr/share/wazuh-indexer/opensearch-security/internal_users.yml wazuh2.indexer: - image: wazuh/wazuh-indexer:4.10.0-alpha2 + image: wazuh/wazuh-indexer:4.10.0 hostname: wazuh2.indexer restart: always environment: @@ -129,7 +129,7 @@ services: - ./config/wazuh_indexer/internal_users.yml:/usr/share/wazuh-indexer/opensearch-security/internal_users.yml wazuh3.indexer: - image: wazuh/wazuh-indexer:4.10.0-alpha2 + image: wazuh/wazuh-indexer:4.10.0 hostname: wazuh3.indexer restart: always environment: @@ -151,7 +151,7 @@ services: - ./config/wazuh_indexer/internal_users.yml:/usr/share/wazuh-indexer/opensearch-security/internal_users.yml wazuh.dashboard: - image: wazuh/wazuh-dashboard:4.10.0-alpha2 + image: wazuh/wazuh-dashboard:4.10.0 hostname: wazuh.dashboard restart: always ports: diff --git a/single-node/docker-compose.yml b/single-node/docker-compose.yml index 995362c0..a17a0368 100644 --- a/single-node/docker-compose.yml +++ b/single-node/docker-compose.yml @@ -3,7 +3,7 @@ version: '3.7' services: wazuh.manager: - image: wazuh/wazuh-manager:4.10.0-alpha2 + image: wazuh/wazuh-manager:4.10.0 hostname: wazuh.manager restart: always ulimits: @@ -46,7 +46,7 @@ services: - ./config/wazuh_cluster/wazuh_manager.conf:/wazuh-config-mount/etc/ossec.conf wazuh.indexer: - image: wazuh/wazuh-indexer:4.10.0-alpha2 + image: wazuh/wazuh-indexer:4.10.0 hostname: wazuh.indexer restart: always ports: @@ -71,7 +71,7 @@ services: - ./config/wazuh_indexer/internal_users.yml:/usr/share/wazuh-indexer/opensearch-security/internal_users.yml wazuh.dashboard: - image: wazuh/wazuh-dashboard:4.10.0-alpha2 + image: wazuh/wazuh-dashboard:4.10.0 hostname: wazuh.dashboard restart: always ports: