From eb4efb345833114d40bfb988961eb3a79ef9f81f Mon Sep 17 00:00:00 2001 From: c-bordon Date: Fri, 27 Sep 2024 09:05:56 -0300 Subject: [PATCH 01/18] Bump 4.9.1 revision --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index a581c033..ae36892c 100644 --- a/VERSION +++ b/VERSION @@ -1,2 +1,2 @@ WAZUH-DOCKER_VERSION="4.9.1" -REVISION="40911" +REVISION="40912" From 62ae93eee96b8fb9f4aadf24f0d0301df0e48699 Mon Sep 17 00:00:00 2001 From: c-bordon Date: Fri, 27 Sep 2024 09:18:13 -0300 Subject: [PATCH 02/18] Updated Wazuh images to -rc2 version --- 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 d78454b4..3ee093b4 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.1 + image: wazuh/wazuh-manager:4.9.1-rc2 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.1 + image: wazuh/wazuh-manager:4.9.1-rc2 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.1 + image: wazuh/wazuh-indexer:4.9.1-rc2 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.1 + image: wazuh/wazuh-indexer:4.9.1-rc2 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.1 + image: wazuh/wazuh-indexer:4.9.1-rc2 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.1 + image: wazuh/wazuh-dashboard:4.9.1-rc2 hostname: wazuh.dashboard restart: always ports: diff --git a/single-node/docker-compose.yml b/single-node/docker-compose.yml index a36491c7..52ccacb1 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.1 + image: wazuh/wazuh-manager:4.9.1-rc2 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.1 + image: wazuh/wazuh-indexer:4.9.1-rc2 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.1 + image: wazuh/wazuh-dashboard:4.9.1-rc2 hostname: wazuh.dashboard restart: always ports: From 0ec38df1c73e2ba75a85290715f379733cce0bd2 Mon Sep 17 00:00:00 2001 From: c-bordon Date: Fri, 27 Sep 2024 09:26:49 -0300 Subject: [PATCH 03/18] Revert Wazuh images to -rc2 version --- 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 3ee093b4..d78454b4 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.1-rc2 + image: wazuh/wazuh-manager:4.9.1 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.1-rc2 + image: wazuh/wazuh-manager:4.9.1 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.1-rc2 + image: wazuh/wazuh-indexer:4.9.1 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.1-rc2 + image: wazuh/wazuh-indexer:4.9.1 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.1-rc2 + image: wazuh/wazuh-indexer:4.9.1 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.1-rc2 + image: wazuh/wazuh-dashboard:4.9.1 hostname: wazuh.dashboard restart: always ports: diff --git a/single-node/docker-compose.yml b/single-node/docker-compose.yml index 52ccacb1..a36491c7 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.1-rc2 + image: wazuh/wazuh-manager:4.9.1 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.1-rc2 + image: wazuh/wazuh-indexer:4.9.1 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.1-rc2 + image: wazuh/wazuh-dashboard:4.9.1 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 04/18] Update Procedure_push_docker_images.yml --- .../Procedure_push_docker_images.yml | 101 +++++++++++++----- 1 file changed, 77 insertions(+), 24 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: 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: + description: 'Filebeat module version' + default: '0.4' + required: true + revision: + description: 'Package revision' + default: '1' + required: true + push_images: + description: 'Push images' + type: boolean + default: true required: true - PRODUCTS: + 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 - FILEBEAT_MODULE_VERSION: + type: string + filebeat_module_version: description: 'Filebeat module version' + default: '0.4' required: true - REVISION: + type: string + revision: description: 'Package revision' default: '1' required: true - PUSH_IMAGES: + 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 05/18] 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 92d0582201cc5c29135c289be3e5ea89fe6f3f1b Mon Sep 17 00:00:00 2001 From: Enrique Araque Date: Thu, 3 Oct 2024 13:18:25 +0200 Subject: [PATCH 06/18] Revert create_user.py script deletion --- .../wazuh-manager/config/etc/cont-init.d/2-manager | 1 - 1 file changed, 1 deletion(-) diff --git a/build-docker-images/wazuh-manager/config/etc/cont-init.d/2-manager b/build-docker-images/wazuh-manager/config/etc/cont-init.d/2-manager index 9e9aa995..0bd90fd6 100644 --- a/build-docker-images/wazuh-manager/config/etc/cont-init.d/2-manager +++ b/build-docker-images/wazuh-manager/config/etc/cont-init.d/2-manager @@ -93,7 +93,6 @@ EOF if /var/ossec/framework/python/bin/python3 /var/ossec/framework/scripts/create_user.py; then # remove json if exit code is 0 rm /var/ossec/api/configuration/admin.json - rm /var/ossec/framework/scripts/create_user.py else echored "There was an error configuring the API user" # terminate container to avoid unpredictable behavior From 884151b3220e0bcb42b59fcb75d9f3f7a5781587 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Correa=20Rodr=C3=ADguez?= Date: Fri, 4 Oct 2024 10:12:37 +0200 Subject: [PATCH 07/18] Bumped revision for 4.9.1-RC3 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index ae36892c..71e09963 100644 --- a/VERSION +++ b/VERSION @@ -1,2 +1,2 @@ WAZUH-DOCKER_VERSION="4.9.1" -REVISION="40912" +REVISION="40913" From 4177d1095cf6203e7bbdfe65bed77a779bcaf5ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Correa=20Rodr=C3=ADguez?= Date: Fri, 4 Oct 2024 10:23:16 +0200 Subject: [PATCH 08/18] Changed image tag for 4.9.1-rc3 --- 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 d78454b4..af6b58ea 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.1 + image: wazuh/wazuh-manager:4.9.1-rc3 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.1 + image: wazuh/wazuh-manager:4.9.1-rc3 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.1 + image: wazuh/wazuh-indexer:4.9.1-rc3 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.1 + image: wazuh/wazuh-indexer:4.9.1-rc3 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.1 + image: wazuh/wazuh-indexer:4.9.1-rc3 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.1 + image: wazuh/wazuh-dashboard:4.9.1-rc3 hostname: wazuh.dashboard restart: always ports: diff --git a/single-node/docker-compose.yml b/single-node/docker-compose.yml index a36491c7..a99c4327 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.1 + image: wazuh/wazuh-manager:4.9.1-rc3 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.1 + image: wazuh/wazuh-indexer:4.9.1-rc3 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.1 + image: wazuh/wazuh-dashboard:4.9.1-rc3 hostname: wazuh.dashboard restart: always ports: From 868c371c31920865177c71a1a5edbff7172236d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Correa=20Rodr=C3=ADguez?= Date: Fri, 4 Oct 2024 10:27:14 +0200 Subject: [PATCH 09/18] Reverted image tag for 4.9.1-rc3 --- 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 af6b58ea..d78454b4 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.1-rc3 + image: wazuh/wazuh-manager:4.9.1 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.1-rc3 + image: wazuh/wazuh-manager:4.9.1 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.1-rc3 + image: wazuh/wazuh-indexer:4.9.1 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.1-rc3 + image: wazuh/wazuh-indexer:4.9.1 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.1-rc3 + image: wazuh/wazuh-indexer:4.9.1 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.1-rc3 + image: wazuh/wazuh-dashboard:4.9.1 hostname: wazuh.dashboard restart: always ports: diff --git a/single-node/docker-compose.yml b/single-node/docker-compose.yml index a99c4327..a36491c7 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.1-rc3 + image: wazuh/wazuh-manager:4.9.1 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.1-rc3 + image: wazuh/wazuh-indexer:4.9.1 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.1-rc3 + image: wazuh/wazuh-dashboard:4.9.1 hostname: wazuh.dashboard restart: always ports: From 1aa149933be732c6cb8e459738b75dab68dc9c61 Mon Sep 17 00:00:00 2001 From: vcerenu Date: Thu, 10 Oct 2024 11:09:09 -0300 Subject: [PATCH 10/18] Fix typos --- .../wazuh-manager/config/etc/cont-init.d/0-wazuh-init | 2 +- .../wazuh-manager/config/etc/cont-init.d/1-config-filebeat | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build-docker-images/wazuh-manager/config/etc/cont-init.d/0-wazuh-init b/build-docker-images/wazuh-manager/config/etc/cont-init.d/0-wazuh-init index 326c46de..9edb1b00 100644 --- a/build-docker-images/wazuh-manager/config/etc/cont-init.d/0-wazuh-init +++ b/build-docker-images/wazuh-manager/config/etc/cont-init.d/0-wazuh-init @@ -51,7 +51,7 @@ mount_permanent_data() { print "Installing ${permanent_dir}" exec_cmd "cp -a ${data_tmp}. ${permanent_dir}" else - print "The path ${permanent_dir} is empty, skiped" + print "The path ${permanent_dir} is empty, skipped" fi fi done diff --git a/build-docker-images/wazuh-manager/config/etc/cont-init.d/1-config-filebeat b/build-docker-images/wazuh-manager/config/etc/cont-init.d/1-config-filebeat index c4a5c7f4..0a3ed8ff 100644 --- a/build-docker-images/wazuh-manager/config/etc/cont-init.d/1-config-filebeat +++ b/build-docker-images/wazuh-manager/config/etc/cont-init.d/1-config-filebeat @@ -4,7 +4,7 @@ set -e if [ "$INDEXER_URL" != "" ]; then - >&2 echo "Customize Elasticsearch ouput IP" + >&2 echo "Customize Elasticsearch output IP" sed -i "s|hosts:.*|hosts: ['$INDEXER_URL']|g" /etc/filebeat/filebeat.yml fi From f61af29c6bc6b6f3979c054f1f2f05090ec66b0e Mon Sep 17 00:00:00 2001 From: vcerenu Date: Thu, 10 Oct 2024 12:07:39 -0300 Subject: [PATCH 11/18] Add changelog --- CHANGELOG.md | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 648c293a..60e2ebec 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,10 +1,25 @@ # Change Log All notable changes to this project will be documented in this file. -## Wazuh Docker v4.9.1 +## [4.9.1] + ### Added -- Update Wazuh to version [4.9.1](https://github.com/wazuh/wazuh/blob/v4.9.1/CHANGELOG.md#v491) +- None + +### Changed + +- None + + +### Fixed + +- Fix typos into Wazuh manager entrypoint ([#1569](https://github.com/wazuh/wazuh-docker/pull/1569)) + +### Deleted + +- None + ## Wazuh Docker v4.9.0 ### Added From dbb776690d126c8f7845f3e27ca90fdcdf81aefa Mon Sep 17 00:00:00 2001 From: "JESUS D. GARCIA" Date: Thu, 10 Oct 2024 10:43:13 -0500 Subject: [PATCH 12/18] 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 13/18] 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 14/18] 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 276c8a2e6c8c925e40e0e749c913b3427e910263 Mon Sep 17 00:00:00 2001 From: vcerenu Date: Tue, 15 Oct 2024 12:05:27 -0300 Subject: [PATCH 15/18] Bump revision --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 71e09963..12be3220 100644 --- a/VERSION +++ b/VERSION @@ -1,2 +1,2 @@ WAZUH-DOCKER_VERSION="4.9.1" -REVISION="40913" +REVISION="40914" From 564e2b3ec42f09b251f9edabb34bcc2fa0c493ab Mon Sep 17 00:00:00 2001 From: vcerenu Date: Tue, 15 Oct 2024 12:41:31 -0300 Subject: [PATCH 16/18] change image taf for rc4 --- 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 d78454b4..fc4d8587 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.1 + image: wazuh/wazuh-manager:4.9.1-rc4 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.1 + image: wazuh/wazuh-manager:4.9.1-rc4 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.1 + image: wazuh/wazuh-indexer:4.9.1-rc4 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.1 + image: wazuh/wazuh-indexer:4.9.1-rc4 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.1 + image: wazuh/wazuh-indexer:4.9.1-rc4 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.1 + image: wazuh/wazuh-dashboard:4.9.1-rc4 hostname: wazuh.dashboard restart: always ports: diff --git a/single-node/docker-compose.yml b/single-node/docker-compose.yml index a36491c7..a83eb6a2 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.1 + image: wazuh/wazuh-manager:4.9.1-rc4 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.1 + image: wazuh/wazuh-indexer:4.9.1-rc4 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.1 + image: wazuh/wazuh-dashboard:4.9.1-rc4 hostname: wazuh.dashboard restart: always ports: From 5bbacebe89078eed02dd823fce118a2a8592bf1b Mon Sep 17 00:00:00 2001 From: vcerenu Date: Tue, 15 Oct 2024 12:59:17 -0300 Subject: [PATCH 17/18] Revert image tag for rc4 --- 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 fc4d8587..d78454b4 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.1-rc4 + image: wazuh/wazuh-manager:4.9.1 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.1-rc4 + image: wazuh/wazuh-manager:4.9.1 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.1-rc4 + image: wazuh/wazuh-indexer:4.9.1 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.1-rc4 + image: wazuh/wazuh-indexer:4.9.1 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.1-rc4 + image: wazuh/wazuh-indexer:4.9.1 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.1-rc4 + image: wazuh/wazuh-dashboard:4.9.1 hostname: wazuh.dashboard restart: always ports: diff --git a/single-node/docker-compose.yml b/single-node/docker-compose.yml index a83eb6a2..a36491c7 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.1-rc4 + image: wazuh/wazuh-manager:4.9.1 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.1-rc4 + image: wazuh/wazuh-indexer:4.9.1 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.1-rc4 + image: wazuh/wazuh-dashboard:4.9.1 hostname: wazuh.dashboard restart: always ports: From 7ca14b9fc85b517452952b256b337f8619043cd1 Mon Sep 17 00:00:00 2001 From: vcerenu Date: Thu, 17 Oct 2024 12:34:40 -0300 Subject: [PATCH 18/18] Resolve conflicts --- .github/workflows/Procedure_push_docker_images.yml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/.github/workflows/Procedure_push_docker_images.yml b/.github/workflows/Procedure_push_docker_images.yml index 92015d55..3a627c25 100644 --- a/.github/workflows/Procedure_push_docker_images.yml +++ b/.github/workflows/Procedure_push_docker_images.yml @@ -10,15 +10,9 @@ on: required: true docker_reference: description: 'wazuh-docker reference' -<<<<<<< HEAD - default: 'v4.10.0' - required: false - products: -======= default: 'v4.10.1' required: true PRODUCTS: ->>>>>>> 46d6dc8fe58467e679fc57a86a5fe99394628b87 description: 'Comma-separated list of the image names to build and push' default: 'wazuh-manager,wazuh-dashboard,wazuh-indexer' required: true