From d20bbe247c959020de34156819f69838425aa38f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Correa=20Rodr=C3=ADguez?= Date: Thu, 3 Aug 2023 11:45:56 +0200 Subject: [PATCH 1/2] Fixed conditional block in images building --- build-docker-images/build-images.sh | 7 ------- 1 file changed, 7 deletions(-) diff --git a/build-docker-images/build-images.sh b/build-docker-images/build-images.sh index 5e5e5fec..f6dec2b1 100755 --- a/build-docker-images/build-images.sh +++ b/build-docker-images/build-images.sh @@ -3,13 +3,6 @@ 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') -## If wazuh manager exists in apt dev repository, change variables, if not, exit 1 -if [ "$WAZUH_VERSION" -le "$WAZUH_CURRENT_VERSION" ]; then - IMAGE_VERSION=${WAZUH_IMAGE_VERSION} -else - IMAGE_VERSION=${WAZUH_IMAGE_VERSION} -fi - echo WAZUH_VERSION=$WAZUH_IMAGE_VERSION > .env echo WAZUH_IMAGE_VERSION=$IMAGE_VERSION >> .env echo WAZUH_TAG_REVISION=$WAZUH_TAG_REVISION >> .env From 94be842afcadd865a8a2443fe1c7ffa20e455581 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Correa=20Rodr=C3=ADguez?= Date: Thu, 3 Aug 2023 11:51:01 +0200 Subject: [PATCH 2/2] Restored `IMAGE_VERSION` variable --- build-docker-images/build-images.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/build-docker-images/build-images.sh b/build-docker-images/build-images.sh index f6dec2b1..be814f84 100755 --- a/build-docker-images/build-images.sh +++ b/build-docker-images/build-images.sh @@ -2,6 +2,7 @@ WAZUH_IMAGE_VERSION=4.5.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') +IMAGE_VERSION=${WAZUH_IMAGE_VERSION} echo WAZUH_VERSION=$WAZUH_IMAGE_VERSION > .env echo WAZUH_IMAGE_VERSION=$IMAGE_VERSION >> .env