From e29dd1195b388bdf20705f54e377cf1cd6fa5452 Mon Sep 17 00:00:00 2001 From: fcaffieri Date: Thu, 6 Feb 2025 13:27:42 -0300 Subject: [PATCH 1/7] Revision bump --- VERSION | 2 +- build-docker-images/.env | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) create mode 100644 build-docker-images/.env diff --git a/VERSION b/VERSION index 2ef68c0e..3f0eb6a6 100644 --- a/VERSION +++ b/VERSION @@ -1,2 +1,2 @@ WAZUH-DOCKER_VERSION="4.11.0" -REVISION="41101" +REVISION="41102" diff --git a/build-docker-images/.env b/build-docker-images/.env new file mode 100644 index 00000000..19a4ad90 --- /dev/null +++ b/build-docker-images/.env @@ -0,0 +1,3 @@ +WAZUH_VERSION=4.3.10 +WAZUH_IMAGE_VERSION=4.3.10 +WAZUH_TAG_REVISION=1 From ae32e0111d9a6a6853bdb89a83997156c4c71345 Mon Sep 17 00:00:00 2001 From: fcaffieri Date: Thu, 6 Feb 2025 13:29:27 -0300 Subject: [PATCH 2/7] Revision bump --- build-docker-images/.env | 3 --- 1 file changed, 3 deletions(-) delete mode 100644 build-docker-images/.env diff --git a/build-docker-images/.env b/build-docker-images/.env deleted file mode 100644 index 19a4ad90..00000000 --- a/build-docker-images/.env +++ /dev/null @@ -1,3 +0,0 @@ -WAZUH_VERSION=4.3.10 -WAZUH_IMAGE_VERSION=4.3.10 -WAZUH_TAG_REVISION=1 From 7a189605eb9c34e85d042a845567348a69a623a0 Mon Sep 17 00:00:00 2001 From: fcaffieri Date: Thu, 6 Feb 2025 13:36:38 -0300 Subject: [PATCH 3/7] Image tags changed for beta1 --- 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 f1a671d5..090599f1 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.11.0 + image: wazuh/wazuh-manager:4.11.0-beta1 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.11.0 + image: wazuh/wazuh-manager:4.11.0-beta1 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.11.0 + image: wazuh/wazuh-indexer:4.11.0-beta1 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.11.0 + image: wazuh/wazuh-indexer:4.11.0-beta1 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.11.0 + image: wazuh/wazuh-indexer:4.11.0-beta1 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.11.0 + image: wazuh/wazuh-dashboard:4.11.0-beta1 hostname: wazuh.dashboard restart: always ports: diff --git a/single-node/docker-compose.yml b/single-node/docker-compose.yml index 90df4be8..5cc7510e 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.11.0 + image: wazuh/wazuh-manager:4.11.0-beta1 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.11.0 + image: wazuh/wazuh-indexer:4.11.0-beta1 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.11.0 + image: wazuh/wazuh-dashboard:4.11.0-beta1 hostname: wazuh.dashboard restart: always ports: From 281cde72923c46d4c107320b2fb1972fd9c46be0 Mon Sep 17 00:00:00 2001 From: fcaffieri Date: Thu, 6 Feb 2025 13:53:46 -0300 Subject: [PATCH 4/7] Revert image tags for beta1 --- 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 090599f1..f1a671d5 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.11.0-beta1 + image: wazuh/wazuh-manager:4.11.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.11.0-beta1 + image: wazuh/wazuh-manager:4.11.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.11.0-beta1 + image: wazuh/wazuh-indexer:4.11.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.11.0-beta1 + image: wazuh/wazuh-indexer:4.11.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.11.0-beta1 + image: wazuh/wazuh-indexer:4.11.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.11.0-beta1 + image: wazuh/wazuh-dashboard:4.11.0 hostname: wazuh.dashboard restart: always ports: diff --git a/single-node/docker-compose.yml b/single-node/docker-compose.yml index 5cc7510e..90df4be8 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.11.0-beta1 + image: wazuh/wazuh-manager:4.11.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.11.0-beta1 + image: wazuh/wazuh-indexer:4.11.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.11.0-beta1 + image: wazuh/wazuh-dashboard:4.11.0 hostname: wazuh.dashboard restart: always ports: From 331fb1969ead7240c773e9aa66f8f0374bf6517a Mon Sep 17 00:00:00 2001 From: Enrique Araque Date: Fri, 14 Feb 2025 12:39:18 +0100 Subject: [PATCH 5/7] Bump revision and change image tag --- VERSION | 2 +- multi-node/docker-compose.yml | 12 ++++++------ single-node/docker-compose.yml | 6 +++--- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/VERSION b/VERSION index 3f0eb6a6..e8068a04 100644 --- a/VERSION +++ b/VERSION @@ -1,2 +1,2 @@ WAZUH-DOCKER_VERSION="4.11.0" -REVISION="41102" +REVISION="41104" diff --git a/multi-node/docker-compose.yml b/multi-node/docker-compose.yml index f1a671d5..e1d91bb4 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.11.0 + image: wazuh/wazuh-manager:4.11.0-rc1 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.11.0 + image: wazuh/wazuh-manager:4.11.0-rc1 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.11.0 + image: wazuh/wazuh-indexer:4.11.0-rc1 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.11.0 + image: wazuh/wazuh-indexer:4.11.0-rc1 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.11.0 + image: wazuh/wazuh-indexer:4.11.0-rc1 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.11.0 + image: wazuh/wazuh-dashboard:4.11.0-rc1 hostname: wazuh.dashboard restart: always ports: diff --git a/single-node/docker-compose.yml b/single-node/docker-compose.yml index 90df4be8..88e7e117 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.11.0 + image: wazuh/wazuh-manager:4.11.0-rc1 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.11.0 + image: wazuh/wazuh-indexer:4.11.0-rc1 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.11.0 + image: wazuh/wazuh-dashboard:4.11.0-rc1 hostname: wazuh.dashboard restart: always ports: From af33c2dd7ce3fdba27fc1bea5bd007a1e7ec9117 Mon Sep 17 00:00:00 2001 From: Enrique Araque Date: Fri, 14 Feb 2025 12:40:55 +0100 Subject: [PATCH 6/7] Fix revision --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index e8068a04..97db90c4 100644 --- a/VERSION +++ b/VERSION @@ -1,2 +1,2 @@ WAZUH-DOCKER_VERSION="4.11.0" -REVISION="41104" +REVISION="41103" From 06821f172f0456b416b9053cb30e1f91d6e18ec2 Mon Sep 17 00:00:00 2001 From: Enrique Araque Date: Fri, 14 Feb 2025 12:48:50 +0100 Subject: [PATCH 7/7] Revert docker image for 4.11.0-rc1 --- 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 e1d91bb4..f1a671d5 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.11.0-rc1 + image: wazuh/wazuh-manager:4.11.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.11.0-rc1 + image: wazuh/wazuh-manager:4.11.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.11.0-rc1 + image: wazuh/wazuh-indexer:4.11.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.11.0-rc1 + image: wazuh/wazuh-indexer:4.11.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.11.0-rc1 + image: wazuh/wazuh-indexer:4.11.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.11.0-rc1 + image: wazuh/wazuh-dashboard:4.11.0 hostname: wazuh.dashboard restart: always ports: diff --git a/single-node/docker-compose.yml b/single-node/docker-compose.yml index 88e7e117..90df4be8 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.11.0-rc1 + image: wazuh/wazuh-manager:4.11.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.11.0-rc1 + image: wazuh/wazuh-indexer:4.11.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.11.0-rc1 + image: wazuh/wazuh-dashboard:4.11.0 hostname: wazuh.dashboard restart: always ports: