From c54db5e09aab20b8279b4844ce20fa977adf9f87 Mon Sep 17 00:00:00 2001 From: vcerenu Date: Mon, 17 Feb 2025 13:23:35 -0300 Subject: [PATCH] Standardize version file format to VERSION.json --- README.md | 2 +- VERSION | 2 -- VERSION.json | 4 ++++ build-docker-images/build-images.sh | 9 ++------- 4 files changed, 7 insertions(+), 10 deletions(-) delete mode 100644 VERSION create mode 100644 VERSION.json diff --git a/README.md b/README.md index 1c23f26cb..286cec0ad 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 ## Branches diff --git a/VERSION b/VERSION deleted file mode 100644 index 1c77a838f..000000000 --- a/VERSION +++ /dev/null @@ -1,2 +0,0 @@ -WAZUH-DOCKER_VERSION="5.0.0" -REVISION="50000" diff --git a/VERSION.json b/VERSION.json new file mode 100644 index 000000000..93df817f4 --- /dev/null +++ b/VERSION.json @@ -0,0 +1,4 @@ +{ + "version": "5.0.0", + "stage": "alpha0" +} diff --git a/build-docker-images/build-images.sh b/build-docker-images/build-images.sh index 6acdb2d38..42628f7e9 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