From 6195484a82610ce934281f47ab4852ab88f4b6cf Mon Sep 17 00:00:00 2001 From: vcerenu Date: Mon, 17 Feb 2025 13:23:35 -0300 Subject: [PATCH 1/5] 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 2/5] 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 3/5] 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 4/5] 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 5/5] 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