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 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 deleted file mode 100644 index f2616b05..00000000 --- a/VERSION +++ /dev/null @@ -1,2 +0,0 @@ -WAZUH-DOCKER_VERSION="4.12.0" -REVISION="41200" diff --git a/VERSION.json b/VERSION.json new file mode 100644 index 00000000..23a3b07a --- /dev/null +++ b/VERSION.json @@ -0,0 +1,4 @@ +{ + "version": "4.12.0", + "stage": "alpha0" +} 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