From e6c5e82a32429b2341eec3e79bd0e7bd048db1de Mon Sep 17 00:00:00 2001 From: c-bordon Date: Thu, 3 Oct 2024 12:11:27 -0300 Subject: [PATCH 01/12] Bumped branch 4.10.2 to 4.10.2 version --- .env | 6 +++--- .github/.goss.yaml | 2 +- .github/workflows/Procedure_push_docker_images.yml | 4 ++-- CHANGELOG.md | 5 +++++ README.md | 1 + VERSION | 4 ++-- build-docker-images/README.md | 4 ++-- build-docker-images/build-images.sh | 4 ++-- multi-node/docker-compose.yml | 12 ++++++------ single-node/docker-compose.yml | 6 +++--- 10 files changed, 27 insertions(+), 21 deletions(-) diff --git a/.env b/.env index 87fd140c..a552278a 100755 --- a/.env +++ b/.env @@ -1,6 +1,6 @@ -WAZUH_VERSION=4.10.1 -WAZUH_IMAGE_VERSION=4.10.1 +WAZUH_VERSION=4.10.2 +WAZUH_IMAGE_VERSION=4.10.2 WAZUH_TAG_REVISION=1 -FILEBEAT_TEMPLATE_BRANCH=4.10.1 +FILEBEAT_TEMPLATE_BRANCH=4.10.2 WAZUH_FILEBEAT_MODULE=wazuh-filebeat-0.4.tar.gz WAZUH_UI_REVISION=1 diff --git a/.github/.goss.yaml b/.github/.goss.yaml index 81b4347f..1761d2c3 100644 --- a/.github/.goss.yaml +++ b/.github/.goss.yaml @@ -56,7 +56,7 @@ package: wazuh-manager: installed: true versions: - - 4.10.1-1 + - 4.10.2-1 port: tcp:1514: listening: true diff --git a/.github/workflows/Procedure_push_docker_images.yml b/.github/workflows/Procedure_push_docker_images.yml index 9cf39fc5..0ac167a9 100644 --- a/.github/workflows/Procedure_push_docker_images.yml +++ b/.github/workflows/Procedure_push_docker_images.yml @@ -6,11 +6,11 @@ on: inputs: IMAGE_TAG: description: 'Docker image tag' - default: '4.10.1' + default: '4.10.2' required: true DOCKER_REFERENCE: description: 'wazuh-docker reference' - default: 'v4.10.1' + default: 'v4.10.2' required: true PRODUCTS: description: 'Comma-separated list of the image names to build and push' diff --git a/CHANGELOG.md b/CHANGELOG.md index ad22820b..67dd51d3 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.2 +### Added + +- Update Wazuh to version [4.10.2](https://github.com/wazuh/wazuh/blob/v4.10.2/CHANGELOG.md#v4101) + ## Wazuh Docker v4.10.1 ### Added diff --git a/README.md b/README.md index 49ae756b..47a7ab7d 100644 --- a/README.md +++ b/README.md @@ -178,6 +178,7 @@ WAZUH_MONITORING_REPLICAS=0 ## | Wazuh version | ODFE | XPACK | |---------------|---------|--------| +| v4.10.2 | | | | v4.10.1 | | | | v4.10.0 | | | | v4.9.1 | | | diff --git a/VERSION b/VERSION index e7740709..42eb9ba1 100644 --- a/VERSION +++ b/VERSION @@ -1,2 +1,2 @@ -WAZUH-DOCKER_VERSION="4.10.1" -REVISION="41010" +WAZUH-DOCKER_VERSION="4.10.2" +REVISION="41020" diff --git a/build-docker-images/README.md b/build-docker-images/README.md index e77766f1..e65cda78 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.10.1 +$ build-docker-images/build-images.sh -v 4.10.2 ``` 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.10.1. + -v, --version [Optional] Set the Wazuh version should be builded. By default, 4.10.2. -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 26c2cd58..9d64121f 100755 --- a/build-docker-images/build-images.sh +++ b/build-docker-images/build-images.sh @@ -1,4 +1,4 @@ -WAZUH_IMAGE_VERSION=4.10.1 +WAZUH_IMAGE_VERSION=4.10.2 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.10.1" +WAZUH_IMAGE_VERSION="4.10.2" WAZUH_TAG_REVISION="1" WAZUH_DEV_STAGE="" FILEBEAT_MODULE_VERSION="0.4" diff --git a/multi-node/docker-compose.yml b/multi-node/docker-compose.yml index 2971d963..10187cfd 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.1 + image: wazuh/wazuh-manager:4.10.2 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.1 + image: wazuh/wazuh-manager:4.10.2 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.1 + image: wazuh/wazuh-indexer:4.10.2 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.1 + image: wazuh/wazuh-indexer:4.10.2 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.1 + image: wazuh/wazuh-indexer:4.10.2 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.1 + image: wazuh/wazuh-dashboard:4.10.2 hostname: wazuh.dashboard restart: always ports: diff --git a/single-node/docker-compose.yml b/single-node/docker-compose.yml index 068171d6..94cb7025 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.1 + image: wazuh/wazuh-manager:4.10.2 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.1 + image: wazuh/wazuh-indexer:4.10.2 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.1 + image: wazuh/wazuh-dashboard:4.10.2 hostname: wazuh.dashboard restart: always ports: From 369560f59f459b16cc2dc1e20b93d9292ea77cb9 Mon Sep 17 00:00:00 2001 From: vcerenu Date: Fri, 1 Nov 2024 11:45:39 -0300 Subject: [PATCH 02/12] Fix permanent data scripts --- .../wazuh-manager/config/etc/cont-init.d/0-wazuh-init | 6 +----- .../wazuh-manager/config/permanent_data.sh | 8 ++------ 2 files changed, 3 insertions(+), 11 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 9edb1b00..b75501f8 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 @@ -47,12 +47,8 @@ mount_permanent_data() { if find ${permanent_dir} -mindepth 1 | read; then print "The path ${permanent_dir} is already mounted" else - if find ${data_tmp} -mindepth 1 | read; then print "Installing ${permanent_dir}" - exec_cmd "cp -a ${data_tmp}. ${permanent_dir}" - else - print "The path ${permanent_dir} is empty, skipped" - fi + exec_cmd "cp -ar ${data_tmp}. ${permanent_dir}" fi done } diff --git a/build-docker-images/wazuh-manager/config/permanent_data.sh b/build-docker-images/wazuh-manager/config/permanent_data.sh index 4df54af5..89e5f8f3 100644 --- a/build-docker-images/wazuh-manager/config/permanent_data.sh +++ b/build-docker-images/wazuh-manager/config/permanent_data.sh @@ -30,11 +30,7 @@ mkdir ${PERMANENT_PATH} for permanent_dir in "${PERMANENT_DATA[@]}"; do # Create the directory for the permanent file if it does not exist DIR=$(dirname "${permanent_dir}") - if [ ! -e ${PERMANENT_PATH}${DIR} ] - then - mkdir -p ${PERMANENT_PATH}${DIR} - fi - - mv ${permanent_dir} ${PERMANENT_PATH}${permanent_dir} + mkdir -p ${PERMANENT_PATH}${DIR} + cp -ar ${permanent_dir} ${PERMANENT_PATH}${DIR} done From 22f34ccb4078c8c0a5b1fe493834e9cc16031751 Mon Sep 17 00:00:00 2001 From: vcerenu Date: Fri, 1 Nov 2024 11:55:54 -0300 Subject: [PATCH 03/12] Add changelog --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 203118e6..ed66b592 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,7 +13,7 @@ All notable changes to this project will be documented in this file. ### Fixed -- None +- Fix permanent data scripts ([#1603](https://github.com/wazuh/wazuh-docker/pull/1603)) ### Deleted From ff54368593d83c054d3b8417c63ceab03e37ac55 Mon Sep 17 00:00:00 2001 From: vcerenu Date: Wed, 18 Dec 2024 13:58:58 -0300 Subject: [PATCH 04/12] Bump new version --- .env | 6 +++--- .github/.goss.yaml | 2 +- .../Procedure_push_docker_images.yml | 4 ++-- CHANGELOG.md | 20 ++++++++++++++++++- README.md | 1 + VERSION | 4 ++-- build-docker-images/README.md | 4 ++-- build-docker-images/build-images.sh | 4 ++-- multi-node/docker-compose.yml | 12 +++++------ single-node/docker-compose.yml | 6 +++--- 10 files changed, 41 insertions(+), 22 deletions(-) diff --git a/.env b/.env index a552278a..3faa3c11 100755 --- a/.env +++ b/.env @@ -1,6 +1,6 @@ -WAZUH_VERSION=4.10.2 -WAZUH_IMAGE_VERSION=4.10.2 +WAZUH_VERSION=4.10.3 +WAZUH_IMAGE_VERSION=4.10.3 WAZUH_TAG_REVISION=1 -FILEBEAT_TEMPLATE_BRANCH=4.10.2 +FILEBEAT_TEMPLATE_BRANCH=4.10.3 WAZUH_FILEBEAT_MODULE=wazuh-filebeat-0.4.tar.gz WAZUH_UI_REVISION=1 diff --git a/.github/.goss.yaml b/.github/.goss.yaml index 1761d2c3..83cdd7f4 100644 --- a/.github/.goss.yaml +++ b/.github/.goss.yaml @@ -56,7 +56,7 @@ package: wazuh-manager: installed: true versions: - - 4.10.2-1 + - 4.10.3-1 port: tcp:1514: listening: true diff --git a/.github/workflows/Procedure_push_docker_images.yml b/.github/workflows/Procedure_push_docker_images.yml index 0bb745cb..bde57e88 100644 --- a/.github/workflows/Procedure_push_docker_images.yml +++ b/.github/workflows/Procedure_push_docker_images.yml @@ -6,11 +6,11 @@ on: inputs: image_tag: description: 'Docker image tag' - default: '4.10.2' + default: '4.10.3' required: true docker_reference: description: 'wazuh-docker reference' - default: 'v4.10.2' + default: 'v4.10.3' required: true PRODUCTS: description: 'Comma-separated list of the image names to build and push' diff --git a/CHANGELOG.md b/CHANGELOG.md index 76765d37..a92404fe 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,24 @@ # Change Log All notable changes to this project will be documented in this file. +## [4.10.3] + +### Added + +- none + +### Changed + +- None + +### Fixed + +- Fix permanent data scripts ([#1603](https://github.com/wazuh/wazuh-docker/pull/1603)) + +### Deleted + +- None + ## [4.10.2] ### Added @@ -13,7 +31,7 @@ All notable changes to this project will be documented in this file. ### Fixed -- Fix permanent data scripts ([#1603](https://github.com/wazuh/wazuh-docker/pull/1603)) +- None ### Deleted diff --git a/README.md b/README.md index 515d8c3c..f6cc0194 100644 --- a/README.md +++ b/README.md @@ -178,6 +178,7 @@ WAZUH_MONITORING_REPLICAS=0 ## | Wazuh version | ODFE | XPACK | |---------------|---------|--------| +| v4.10.3 | | | | v4.10.2 | | | | v4.10.1 | | | | v4.10.0 | | | diff --git a/VERSION b/VERSION index 42eb9ba1..33c4aa26 100644 --- a/VERSION +++ b/VERSION @@ -1,2 +1,2 @@ -WAZUH-DOCKER_VERSION="4.10.2" -REVISION="41020" +WAZUH-DOCKER_VERSION="4.10.3" +REVISION="41030" diff --git a/build-docker-images/README.md b/build-docker-images/README.md index e65cda78..a1034ca9 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.10.2 +$ build-docker-images/build-images.sh -v 4.10.3 ``` 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.10.2. + -v, --version [Optional] Set the Wazuh version should be builded. By default, 4.10.3. -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 9d64121f..38c41a32 100755 --- a/build-docker-images/build-images.sh +++ b/build-docker-images/build-images.sh @@ -1,4 +1,4 @@ -WAZUH_IMAGE_VERSION=4.10.2 +WAZUH_IMAGE_VERSION=4.10.3 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.10.2" +WAZUH_IMAGE_VERSION="4.10.3" WAZUH_TAG_REVISION="1" WAZUH_DEV_STAGE="" FILEBEAT_MODULE_VERSION="0.4" diff --git a/multi-node/docker-compose.yml b/multi-node/docker-compose.yml index 10187cfd..fa037575 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.2 + image: wazuh/wazuh-manager:4.10.3 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.2 + image: wazuh/wazuh-manager:4.10.3 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.2 + image: wazuh/wazuh-indexer:4.10.3 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.2 + image: wazuh/wazuh-indexer:4.10.3 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.2 + image: wazuh/wazuh-indexer:4.10.3 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.2 + image: wazuh/wazuh-dashboard:4.10.3 hostname: wazuh.dashboard restart: always ports: diff --git a/single-node/docker-compose.yml b/single-node/docker-compose.yml index 94cb7025..97e58909 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.2 + image: wazuh/wazuh-manager:4.10.3 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.2 + image: wazuh/wazuh-indexer:4.10.3 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.2 + image: wazuh/wazuh-dashboard:4.10.3 hostname: wazuh.dashboard restart: always ports: From 39768a397a7265341ca64e71a511867185ef3fcd Mon Sep 17 00:00:00 2001 From: vcerenu Date: Fri, 20 Dec 2024 10:45:08 -0300 Subject: [PATCH 05/12] Bump 4.12.0 version --- .env | 6 +++--- .github/.goss.yaml | 2 +- .github/workflows/Procedure_push_docker_images.yml | 4 ++-- CHANGELOG.md | 2 +- README.md | 2 +- VERSION | 4 ++-- build-docker-images/README.md | 4 ++-- build-docker-images/build-images.sh | 4 ++-- multi-node/docker-compose.yml | 12 ++++++------ single-node/docker-compose.yml | 6 +++--- 10 files changed, 23 insertions(+), 23 deletions(-) diff --git a/.env b/.env index 3faa3c11..ab08411d 100755 --- a/.env +++ b/.env @@ -1,6 +1,6 @@ -WAZUH_VERSION=4.10.3 -WAZUH_IMAGE_VERSION=4.10.3 +WAZUH_VERSION=4.12.0 +WAZUH_IMAGE_VERSION=4.12.0 WAZUH_TAG_REVISION=1 -FILEBEAT_TEMPLATE_BRANCH=4.10.3 +FILEBEAT_TEMPLATE_BRANCH=4.12.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 83cdd7f4..019ffa9a 100644 --- a/.github/.goss.yaml +++ b/.github/.goss.yaml @@ -56,7 +56,7 @@ package: wazuh-manager: installed: true versions: - - 4.10.3-1 + - 4.12.0-1 port: tcp:1514: listening: true diff --git a/.github/workflows/Procedure_push_docker_images.yml b/.github/workflows/Procedure_push_docker_images.yml index bde57e88..1c6adcdc 100644 --- a/.github/workflows/Procedure_push_docker_images.yml +++ b/.github/workflows/Procedure_push_docker_images.yml @@ -6,11 +6,11 @@ on: inputs: image_tag: description: 'Docker image tag' - default: '4.10.3' + default: '4.12.0' required: true docker_reference: description: 'wazuh-docker reference' - default: 'v4.10.3' + default: 'v4.12.0' required: true PRODUCTS: description: 'Comma-separated list of the image names to build and push' diff --git a/CHANGELOG.md b/CHANGELOG.md index a92404fe..a472e542 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,7 @@ # Change Log All notable changes to this project will be documented in this file. -## [4.10.3] +## [4.12.0] ### Added diff --git a/README.md b/README.md index f6cc0194..5a2fb14c 100644 --- a/README.md +++ b/README.md @@ -178,7 +178,7 @@ WAZUH_MONITORING_REPLICAS=0 ## | Wazuh version | ODFE | XPACK | |---------------|---------|--------| -| v4.10.3 | | | +| v4.12.0 | | | | v4.10.2 | | | | v4.10.1 | | | | v4.10.0 | | | diff --git a/VERSION b/VERSION index 33c4aa26..f2616b05 100644 --- a/VERSION +++ b/VERSION @@ -1,2 +1,2 @@ -WAZUH-DOCKER_VERSION="4.10.3" -REVISION="41030" +WAZUH-DOCKER_VERSION="4.12.0" +REVISION="41200" diff --git a/build-docker-images/README.md b/build-docker-images/README.md index a1034ca9..f088f408 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.10.3 +$ build-docker-images/build-images.sh -v 4.12.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.10.3. + -v, --version [Optional] Set the Wazuh version should be builded. By default, 4.12.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 38c41a32..542917fe 100755 --- a/build-docker-images/build-images.sh +++ b/build-docker-images/build-images.sh @@ -1,4 +1,4 @@ -WAZUH_IMAGE_VERSION=4.10.3 +WAZUH_IMAGE_VERSION=4.12.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.10.3" +WAZUH_IMAGE_VERSION="4.12.0" WAZUH_TAG_REVISION="1" WAZUH_DEV_STAGE="" FILEBEAT_MODULE_VERSION="0.4" diff --git a/multi-node/docker-compose.yml b/multi-node/docker-compose.yml index fa037575..2d9ad309 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.3 + image: wazuh/wazuh-manager:4.12.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.3 + image: wazuh/wazuh-manager:4.12.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.3 + image: wazuh/wazuh-indexer:4.12.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.3 + image: wazuh/wazuh-indexer:4.12.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.3 + image: wazuh/wazuh-indexer:4.12.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.3 + image: wazuh/wazuh-dashboard:4.12.0 hostname: wazuh.dashboard restart: always ports: diff --git a/single-node/docker-compose.yml b/single-node/docker-compose.yml index 97e58909..bdcc695c 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.3 + image: wazuh/wazuh-manager:4.12.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.3 + image: wazuh/wazuh-indexer:4.12.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.3 + image: wazuh/wazuh-dashboard:4.12.0 hostname: wazuh.dashboard restart: always ports: From 91295a4b39cae4e89ad99d9f8308761577b410d3 Mon Sep 17 00:00:00 2001 From: vcerenu Date: Fri, 20 Dec 2024 13:13:02 -0300 Subject: [PATCH 06/12] Change Ubuntu version used in workflows --- .github/workflows/Procedure_push_docker_images.yml | 2 +- .github/workflows/push.yml | 6 +++--- .github/workflows/trivy-dashboard.yml | 2 +- .github/workflows/trivy-indexer.yml | 2 +- .github/workflows/trivy-manager.yml | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/Procedure_push_docker_images.yml b/.github/workflows/Procedure_push_docker_images.yml index 1c6adcdc..2ae47e6a 100644 --- a/.github/workflows/Procedure_push_docker_images.yml +++ b/.github/workflows/Procedure_push_docker_images.yml @@ -82,7 +82,7 @@ on: jobs: build-and-push: - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 steps: - name: Print inputs diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index c7d34d61..957cceb9 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -4,7 +4,7 @@ on: [pull_request] jobs: build-docker-images: - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 steps: - name: Check out code @@ -61,7 +61,7 @@ jobs: GOSS_FILE: .github/.goss.yaml check-single-node: - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 needs: build-docker-images steps: @@ -189,7 +189,7 @@ jobs: run: ./.github/single-node-log-check.sh check-multi-node: - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 needs: build-docker-images steps: diff --git a/.github/workflows/trivy-dashboard.yml b/.github/workflows/trivy-dashboard.yml index 8bc2decf..4150fa6f 100644 --- a/.github/workflows/trivy-dashboard.yml +++ b/.github/workflows/trivy-dashboard.yml @@ -27,7 +27,7 @@ jobs: security-events: write # for github/codeql-action/upload-sarif to upload SARIF results name: Build images and upload Trivy results - runs-on: "ubuntu-latest" + runs-on: "ubuntu-22.04" steps: - name: Checkout code uses: actions/checkout@v3 diff --git a/.github/workflows/trivy-indexer.yml b/.github/workflows/trivy-indexer.yml index 3582e21d..fe41399e 100644 --- a/.github/workflows/trivy-indexer.yml +++ b/.github/workflows/trivy-indexer.yml @@ -27,7 +27,7 @@ jobs: security-events: write # for github/codeql-action/upload-sarif to upload SARIF results name: Build images and upload Trivy results - runs-on: "ubuntu-latest" + runs-on: "ubuntu-22.04" steps: - name: Checkout code uses: actions/checkout@v3 diff --git a/.github/workflows/trivy-manager.yml b/.github/workflows/trivy-manager.yml index 18bdf1b8..1c8308b3 100644 --- a/.github/workflows/trivy-manager.yml +++ b/.github/workflows/trivy-manager.yml @@ -27,7 +27,7 @@ jobs: security-events: write # for github/codeql-action/upload-sarif to upload SARIF results name: Build images and upload Trivy results - runs-on: "ubuntu-latest" + runs-on: "ubuntu-22.04" steps: - name: Checkout code uses: actions/checkout@v3 From 77ef56ada7962a99b1135e6bfb675cce6b623a4e Mon Sep 17 00:00:00 2001 From: Enrique Araque Date: Fri, 10 Jan 2025 11:53:10 +0100 Subject: [PATCH 07/12] Update 4.11.0 version to 4.12.0 --- .github/free-disk-space/action.yml | 2 +- .github/workflows/Procedure_push_docker_images.yml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/free-disk-space/action.yml b/.github/free-disk-space/action.yml index 3bdfefb0..b4ed7528 100644 --- a/.github/free-disk-space/action.yml +++ b/.github/free-disk-space/action.yml @@ -242,4 +242,4 @@ runs: echo "/dev/root:" printSavedSpace $((AVAILABLE_ROOT_END - AVAILABLE_ROOT_INITIAL)) echo "overall:" - printSavedSpace $((AVAILABLE_END - AVAILABLE_INITIAL)) \ No newline at end of file + printSavedSpace $((AVAILABLE_END - AVAILABLE_INITIAL)) diff --git a/.github/workflows/Procedure_push_docker_images.yml b/.github/workflows/Procedure_push_docker_images.yml index ba5aa3f6..d02f14c9 100644 --- a/.github/workflows/Procedure_push_docker_images.yml +++ b/.github/workflows/Procedure_push_docker_images.yml @@ -42,12 +42,12 @@ on: inputs: image_tag: description: 'Docker image tag' - default: '4.11.0' + default: '4.12.0' required: true type: string docker_reference: description: 'wazuh-docker reference' - default: 'v4.11.0' + default: 'v4.12.0' required: false type: string products: From 6195484a82610ce934281f47ab4852ab88f4b6cf Mon Sep 17 00:00:00 2001 From: vcerenu Date: Mon, 17 Feb 2025 13:23:35 -0300 Subject: [PATCH 08/12] Change VERSION file format --- VERSION | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/VERSION b/VERSION index f2616b05..cef3ce27 100644 --- a/VERSION +++ b/VERSION @@ -1,2 +1,4 @@ -WAZUH-DOCKER_VERSION="4.12.0" -REVISION="41200" +{ + "version": "4.12.0", + "stage": "alpha0" +} \ No newline at end of file From 29e679363da4e219160e2660bd9f0cf90da4df6a Mon Sep 17 00:00:00 2001 From: vcerenu Date: Mon, 17 Feb 2025 13:35:49 -0300 Subject: [PATCH 09/12] Add changelog --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4c603324..7fbaf795 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,7 +9,7 @@ All notable changes to this project will be documented in this file. ### Changed -- None +- Change VERSION file format ([#1728](https://github.com/wazuh/wazuh-docker/pull/1728)) \- (VERSION file) ### Fixed From 87f3dccb0f6012e13f0b125f97fc9b22f5468135 Mon Sep 17 00:00:00 2001 From: vcerenu Date: Mon, 17 Feb 2025 13:36:46 -0300 Subject: [PATCH 10/12] Add newline --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index cef3ce27..23a3b07a 100644 --- a/VERSION +++ b/VERSION @@ -1,4 +1,4 @@ { "version": "4.12.0", "stage": "alpha0" -} \ No newline at end of file +} From d024c37fc5e5388a60ca14c21f2535afe1f577a1 Mon Sep 17 00:00:00 2001 From: vcerenu Date: Mon, 17 Feb 2025 14:13:58 -0300 Subject: [PATCH 11/12] Change VERSION file format --- README.md | 2 +- VERSION => VERSION.json | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename VERSION => VERSION.json (100%) diff --git a/README.md b/README.md index 85c1c2df..32c53dbf 100644 --- a/README.md +++ b/README.md @@ -165,7 +165,7 @@ WAZUH_MONITORING_REPLICAS=0 ## │   ├── docker-compose.yml │   ├── generate-indexer-certs.yml │   └── README.md - └── VERSION + └── VERSION.json diff --git a/VERSION b/VERSION.json similarity index 100% rename from VERSION rename to VERSION.json From ebf837937351b8d80de27b6c7c179ef0dc8ef4d1 Mon Sep 17 00:00:00 2001 From: vcerenu Date: Mon, 17 Feb 2025 14:44:43 -0300 Subject: [PATCH 12/12] Delete VERSION file reference --- build-docker-images/build-images.sh | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/build-docker-images/build-images.sh b/build-docker-images/build-images.sh index 542917fe..d0551e48 100755 --- a/build-docker-images/build-images.sh +++ b/build-docker-images/build-images.sh @@ -53,13 +53,8 @@ build() { elif curl --output /dev/null --silent --head --fail "https://github.com/wazuh/wazuh/tree/${FILEBEAT_TEMPLATE_BRANCH}"; then FILEBEAT_TEMPLATE_BRANCH="${FILEBEAT_TEMPLATE_BRANCH}" else - WAZUH_MASTER_VERSION="$(curl -s https://raw.githubusercontent.com/wazuh/wazuh/master/src/VERSION | sed -e 's/v//g')" - if [ "${FILEBEAT_TEMPLATE_BRANCH}" == "${WAZUH_MASTER_VERSION}" ]; then - FILEBEAT_TEMPLATE_BRANCH="master" - else - echo "The indicated branch does not exist in the wazuh/wazuh repository: ${FILEBEAT_TEMPLATE_BRANCH}" - clean 1 - fi + echo "The indicated branch does not exist in the wazuh/wazuh repository: ${FILEBEAT_TEMPLATE_BRANCH}" + clean 1 fi fi