From 73fffcf52da0abed35e80e4d27bfbbcb94332696 Mon Sep 17 00:00:00 2001 From: vcerenu Date: Thu, 5 Sep 2024 13:12:47 -0300 Subject: [PATCH 01/32] Modify check repository for image builder --- .../config/check_repository.sh | 31 +++++-------------- .../wazuh-indexer/config/check_repository.sh | 31 +++++-------------- .../wazuh-manager/config/check_repository.sh | 31 +++++-------------- .../wazuh-manager/config/filebeat_module.sh | 25 ++++----------- 4 files changed, 30 insertions(+), 88 deletions(-) diff --git a/build-docker-images/wazuh-dashboard/config/check_repository.sh b/build-docker-images/wazuh-dashboard/config/check_repository.sh index 5323ec81..e49e69c2 100644 --- a/build-docker-images/wazuh-dashboard/config/check_repository.sh +++ b/build-docker-images/wazuh-dashboard/config/check_repository.sh @@ -1,29 +1,14 @@ ## variables -APT_KEY=https://packages.wazuh.com/key/GPG-KEY-WAZUH +APT_KEY=https://packages-dev.wazuh.com/key/GPG-KEY-WAZUH GPG_SIGN="gpgcheck=1\ngpgkey=${APT_KEY}]" -REPOSITORY="[wazuh]\n${GPG_SIGN}\nenabled=1\nname=EL-\$releasever - Wazuh\nbaseurl=https://packages.wazuh.com/4.x/yum/\nprotect=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-) -MAJOR_BUILD=$(echo $WAZUH_VERSION | cut -d. -f1) -MID_BUILD=$(echo $WAZUH_VERSION | cut -d. -f2) -MINOR_BUILD=$(echo $WAZUH_VERSION | cut -d. -f3) -MAJOR_CURRENT=$(echo $WAZUH_CURRENT_VERSION | cut -d. -f1) -MID_CURRENT=$(echo $WAZUH_CURRENT_VERSION | cut -d. -f2) -MINOR_CURRENT=$(echo $WAZUH_CURRENT_VERSION | cut -d. -f3) +REPOSITORY="[wazuh]\n${GPG_SIGN}\nenabled=1\nname=EL-\$releasever - Wazuh\nbaseurl=https://packages-dev.wazuh.com/pre-release/yum/\nprotect=1" +WAZUH_TAG=$(curl --silent https://api.github.com/repos/wazuh/wazuh/git/refs/tags | grep '["]ref["]:' | sed -E 's/.*\"([^\"]+)\".*/\1/' | cut -c 11- | grep ^v${WAZUH_VERSION}$) -## check version to use the correct repository -if [ "$MAJOR_BUILD" -gt "$MAJOR_CURRENT" ]; then - APT_KEY=https://packages-dev.wazuh.com/key/GPG-KEY-WAZUH - REPOSITORY="[wazuh]\n${GPG_SIGN}\nenabled=1\nname=EL-\$releasever - Wazuh\nbaseurl=https://packages-dev.wazuh.com/pre-release/yum/\nprotect=1" -elif [ "$MAJOR_BUILD" -eq "$MAJOR_CURRENT" ]; then - if [ "$MID_BUILD" -gt "$MID_CURRENT" ]; then - APT_KEY=https://packages-dev.wazuh.com/key/GPG-KEY-WAZUH - REPOSITORY="[wazuh]\n${GPG_SIGN}\nenabled=1\nname=EL-\$releasever - Wazuh\nbaseurl=https://packages-dev.wazuh.com/pre-release/yum/\nprotect=1" - elif [ "$MID_BUILD" -eq "$MID_CURRENT" ]; then - if [ "$MINOR_BUILD" -gt "$MINOR_CURRENT" ]; then - APT_KEY=https://packages-dev.wazuh.com/key/GPG-KEY-WAZUH - REPOSITORY="[wazuh]\n${GPG_SIGN}\nenabled=1\nname=EL-\$releasever - Wazuh\nbaseurl=https://packages-dev.wazuh.com/pre-release/yum/\nprotect=1" - fi - fi +## check tag to use the correct repository +if [[ -n "${WAZUH_TAG}" ]]; then + APT_KEY=https://packages.wazuh.com/key/GPG-KEY-WAZUH + GPG_SIGN="gpgcheck=1\ngpgkey=${APT_KEY}]" + REPOSITORY="[wazuh]\n${GPG_SIGN}\nenabled=1\nname=EL-\$releasever - Wazuh\nbaseurl=https://packages.wazuh.com/4.x/yum/\nprotect=1" fi rpm --import "${APT_KEY}" diff --git a/build-docker-images/wazuh-indexer/config/check_repository.sh b/build-docker-images/wazuh-indexer/config/check_repository.sh index 5323ec81..e49e69c2 100644 --- a/build-docker-images/wazuh-indexer/config/check_repository.sh +++ b/build-docker-images/wazuh-indexer/config/check_repository.sh @@ -1,29 +1,14 @@ ## variables -APT_KEY=https://packages.wazuh.com/key/GPG-KEY-WAZUH +APT_KEY=https://packages-dev.wazuh.com/key/GPG-KEY-WAZUH GPG_SIGN="gpgcheck=1\ngpgkey=${APT_KEY}]" -REPOSITORY="[wazuh]\n${GPG_SIGN}\nenabled=1\nname=EL-\$releasever - Wazuh\nbaseurl=https://packages.wazuh.com/4.x/yum/\nprotect=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-) -MAJOR_BUILD=$(echo $WAZUH_VERSION | cut -d. -f1) -MID_BUILD=$(echo $WAZUH_VERSION | cut -d. -f2) -MINOR_BUILD=$(echo $WAZUH_VERSION | cut -d. -f3) -MAJOR_CURRENT=$(echo $WAZUH_CURRENT_VERSION | cut -d. -f1) -MID_CURRENT=$(echo $WAZUH_CURRENT_VERSION | cut -d. -f2) -MINOR_CURRENT=$(echo $WAZUH_CURRENT_VERSION | cut -d. -f3) +REPOSITORY="[wazuh]\n${GPG_SIGN}\nenabled=1\nname=EL-\$releasever - Wazuh\nbaseurl=https://packages-dev.wazuh.com/pre-release/yum/\nprotect=1" +WAZUH_TAG=$(curl --silent https://api.github.com/repos/wazuh/wazuh/git/refs/tags | grep '["]ref["]:' | sed -E 's/.*\"([^\"]+)\".*/\1/' | cut -c 11- | grep ^v${WAZUH_VERSION}$) -## check version to use the correct repository -if [ "$MAJOR_BUILD" -gt "$MAJOR_CURRENT" ]; then - APT_KEY=https://packages-dev.wazuh.com/key/GPG-KEY-WAZUH - REPOSITORY="[wazuh]\n${GPG_SIGN}\nenabled=1\nname=EL-\$releasever - Wazuh\nbaseurl=https://packages-dev.wazuh.com/pre-release/yum/\nprotect=1" -elif [ "$MAJOR_BUILD" -eq "$MAJOR_CURRENT" ]; then - if [ "$MID_BUILD" -gt "$MID_CURRENT" ]; then - APT_KEY=https://packages-dev.wazuh.com/key/GPG-KEY-WAZUH - REPOSITORY="[wazuh]\n${GPG_SIGN}\nenabled=1\nname=EL-\$releasever - Wazuh\nbaseurl=https://packages-dev.wazuh.com/pre-release/yum/\nprotect=1" - elif [ "$MID_BUILD" -eq "$MID_CURRENT" ]; then - if [ "$MINOR_BUILD" -gt "$MINOR_CURRENT" ]; then - APT_KEY=https://packages-dev.wazuh.com/key/GPG-KEY-WAZUH - REPOSITORY="[wazuh]\n${GPG_SIGN}\nenabled=1\nname=EL-\$releasever - Wazuh\nbaseurl=https://packages-dev.wazuh.com/pre-release/yum/\nprotect=1" - fi - fi +## check tag to use the correct repository +if [[ -n "${WAZUH_TAG}" ]]; then + APT_KEY=https://packages.wazuh.com/key/GPG-KEY-WAZUH + GPG_SIGN="gpgcheck=1\ngpgkey=${APT_KEY}]" + REPOSITORY="[wazuh]\n${GPG_SIGN}\nenabled=1\nname=EL-\$releasever - Wazuh\nbaseurl=https://packages.wazuh.com/4.x/yum/\nprotect=1" fi rpm --import "${APT_KEY}" diff --git a/build-docker-images/wazuh-manager/config/check_repository.sh b/build-docker-images/wazuh-manager/config/check_repository.sh index 5323ec81..e49e69c2 100644 --- a/build-docker-images/wazuh-manager/config/check_repository.sh +++ b/build-docker-images/wazuh-manager/config/check_repository.sh @@ -1,29 +1,14 @@ ## variables -APT_KEY=https://packages.wazuh.com/key/GPG-KEY-WAZUH +APT_KEY=https://packages-dev.wazuh.com/key/GPG-KEY-WAZUH GPG_SIGN="gpgcheck=1\ngpgkey=${APT_KEY}]" -REPOSITORY="[wazuh]\n${GPG_SIGN}\nenabled=1\nname=EL-\$releasever - Wazuh\nbaseurl=https://packages.wazuh.com/4.x/yum/\nprotect=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-) -MAJOR_BUILD=$(echo $WAZUH_VERSION | cut -d. -f1) -MID_BUILD=$(echo $WAZUH_VERSION | cut -d. -f2) -MINOR_BUILD=$(echo $WAZUH_VERSION | cut -d. -f3) -MAJOR_CURRENT=$(echo $WAZUH_CURRENT_VERSION | cut -d. -f1) -MID_CURRENT=$(echo $WAZUH_CURRENT_VERSION | cut -d. -f2) -MINOR_CURRENT=$(echo $WAZUH_CURRENT_VERSION | cut -d. -f3) +REPOSITORY="[wazuh]\n${GPG_SIGN}\nenabled=1\nname=EL-\$releasever - Wazuh\nbaseurl=https://packages-dev.wazuh.com/pre-release/yum/\nprotect=1" +WAZUH_TAG=$(curl --silent https://api.github.com/repos/wazuh/wazuh/git/refs/tags | grep '["]ref["]:' | sed -E 's/.*\"([^\"]+)\".*/\1/' | cut -c 11- | grep ^v${WAZUH_VERSION}$) -## check version to use the correct repository -if [ "$MAJOR_BUILD" -gt "$MAJOR_CURRENT" ]; then - APT_KEY=https://packages-dev.wazuh.com/key/GPG-KEY-WAZUH - REPOSITORY="[wazuh]\n${GPG_SIGN}\nenabled=1\nname=EL-\$releasever - Wazuh\nbaseurl=https://packages-dev.wazuh.com/pre-release/yum/\nprotect=1" -elif [ "$MAJOR_BUILD" -eq "$MAJOR_CURRENT" ]; then - if [ "$MID_BUILD" -gt "$MID_CURRENT" ]; then - APT_KEY=https://packages-dev.wazuh.com/key/GPG-KEY-WAZUH - REPOSITORY="[wazuh]\n${GPG_SIGN}\nenabled=1\nname=EL-\$releasever - Wazuh\nbaseurl=https://packages-dev.wazuh.com/pre-release/yum/\nprotect=1" - elif [ "$MID_BUILD" -eq "$MID_CURRENT" ]; then - if [ "$MINOR_BUILD" -gt "$MINOR_CURRENT" ]; then - APT_KEY=https://packages-dev.wazuh.com/key/GPG-KEY-WAZUH - REPOSITORY="[wazuh]\n${GPG_SIGN}\nenabled=1\nname=EL-\$releasever - Wazuh\nbaseurl=https://packages-dev.wazuh.com/pre-release/yum/\nprotect=1" - fi - fi +## check tag to use the correct repository +if [[ -n "${WAZUH_TAG}" ]]; then + APT_KEY=https://packages.wazuh.com/key/GPG-KEY-WAZUH + GPG_SIGN="gpgcheck=1\ngpgkey=${APT_KEY}]" + REPOSITORY="[wazuh]\n${GPG_SIGN}\nenabled=1\nname=EL-\$releasever - Wazuh\nbaseurl=https://packages.wazuh.com/4.x/yum/\nprotect=1" fi rpm --import "${APT_KEY}" diff --git a/build-docker-images/wazuh-manager/config/filebeat_module.sh b/build-docker-images/wazuh-manager/config/filebeat_module.sh index 000a69ef..5357255d 100644 --- a/build-docker-images/wazuh-manager/config/filebeat_module.sh +++ b/build-docker-images/wazuh-manager/config/filebeat_module.sh @@ -1,23 +1,10 @@ -REPOSITORY="packages.wazuh.com/4.x" -WAZUH_CURRENT_VERSION=$(curl --silent https://api.github.com/repos/wazuh/wazuh/releases/latest | grep '["]tag_name["]:' | sed -E 's/.*\"([^\"]+)\".*/\1/' | cut -c 2-) -MAJOR_BUILD=$(echo $WAZUH_VERSION | cut -d. -f1) -MID_BUILD=$(echo $WAZUH_VERSION | cut -d. -f2) -MINOR_BUILD=$(echo $WAZUH_VERSION | cut -d. -f3) -MAJOR_CURRENT=$(echo $WAZUH_CURRENT_VERSION | cut -d. -f1) -MID_CURRENT=$(echo $WAZUH_CURRENT_VERSION | cut -d. -f2) -MINOR_CURRENT=$(echo $WAZUH_CURRENT_VERSION | cut -d. -f3) +## variables +REPOSITORY="packages-dev.wazuh.com/pre-release" +WAZUH_TAG=$(curl --silent https://api.github.com/repos/wazuh/wazuh/git/refs/tags | grep '["]ref["]:' | sed -E 's/.*\"([^\"]+)\".*/\1/' | cut -c 11- | grep ^v${WAZUH_VERSION}$) -## check version to use the correct repository -if [ "$MAJOR_BUILD" -gt "$MAJOR_CURRENT" ]; then - REPOSITORY="packages-dev.wazuh.com/pre-release" -elif [ "$MAJOR_BUILD" -eq "$MAJOR_CURRENT" ]; then - if [ "$MID_BUILD" -gt "$MID_CURRENT" ]; then - REPOSITORY="packages-dev.wazuh.com/pre-release" - elif [ "$MID_BUILD" -eq "$MID_CURRENT" ]; then - if [ "$MINOR_BUILD" -gt "$MINOR_CURRENT" ]; then - REPOSITORY="packages-dev.wazuh.com/pre-release" - fi - fi +## check tag to use the correct repository +if [[ -n "${WAZUH_TAG}" ]]; then + REPOSITORY="packages.wazuh.com/4.x" fi curl -L -O https://artifacts.elastic.co/downloads/beats/filebeat/${FILEBEAT_CHANNEL}-${FILEBEAT_VERSION}-x86_64.rpm &&\ From 8e7b2cd39041b54e5791fac7c979d8b2d704db48 Mon Sep 17 00:00:00 2001 From: vcerenu Date: Thu, 5 Sep 2024 15:19:32 -0300 Subject: [PATCH 02/32] Add delete of wazuh yum repo --- build-docker-images/wazuh-manager/Dockerfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/build-docker-images/wazuh-manager/Dockerfile b/build-docker-images/wazuh-manager/Dockerfile index ba4f27fa..7bbfdfc7 100644 --- a/build-docker-images/wazuh-manager/Dockerfile +++ b/build-docker-images/wazuh-manager/Dockerfile @@ -60,6 +60,8 @@ RUN mkdir -p /var/ossec/var/multigroups && \ sync && /permanent_data.sh && \ sync && rm /permanent_data.sh +RUN rm /etc/yum.repos.d/wazuh.repo + # Services ports EXPOSE 55000/tcp 1514/tcp 1515/tcp 514/udp 1516/tcp From b38b3c7e598dd22e54d3a6290950aa345966e053 Mon Sep 17 00:00:00 2001 From: "JESUS D. GARCIA" Date: Wed, 11 Sep 2024 18:40:31 -0500 Subject: [PATCH 03/32] * Update the Procedure push docker images workflow file * Handle the build process exit code properly --- .../Procedure_push_docker_images.yml | 98 +++++++++++++++++-- build-docker-images/build-images.sh | 2 +- 2 files changed, 90 insertions(+), 10 deletions(-) diff --git a/.github/workflows/Procedure_push_docker_images.yml b/.github/workflows/Procedure_push_docker_images.yml index 7f7bb30d..4dc4d0d4 100644 --- a/.github/workflows/Procedure_push_docker_images.yml +++ b/.github/workflows/Procedure_push_docker_images.yml @@ -1,22 +1,17 @@ - run-name: Launch Push Docker Images - Executed by @${{ github.actor }} name: Push Docker Images on: workflow_dispatch: inputs: - JENKINS_REFERENCE: - description: 'wazuh-jenkins reference' - required: true - default: 'master' IMAGE_TAG: description: 'Docker image tag' - required: true default: '4.10.0' + required: true DOCKER_REFERENCE: description: 'wazuh-docker reference' + default: 'v4.10.0' required: true - default: '4.10.0' PRODUCTS: description: 'Comma-separated list of the image names to build and push' default: 'wazuh-manager,wazuh-dashboard,wazuh-indexer' @@ -26,9 +21,94 @@ on: required: true REVISION: description: 'Package revision' + default: '1' required: true PUSH_IMAGES: description: 'Push images' - required: true type: boolean - default: true \ No newline at end of file + default: true + required: true + +jobs: + build-and-push: + runs-on: ubuntu-latest + + steps: + - name: Print inputs + run: | + echo "---------------------------------------------" + echo "Running Procedure_push_docker_images workflow" + echo "---------------------------------------------" + echo "* BRANCH: ${{ github.ref }}" + echo "* COMMIT: ${{ github.sha }}" + echo "---------------------------------------------" + echo "Inputs provided:" + echo "---------------------------------------------" + echo "* IMAGE_TAG: ${{ inputs.IMAGE_TAG }}" + echo "* DOCKER_REFERENCE: ${{ inputs.DOCKER_REFERENCE }}" + echo "* PRODUCTS: ${{ inputs.PRODUCTS }}" + echo "* FILEBEAT_MODULE_VERSION: ${{ inputs.FILEBEAT_MODULE_VERSION }}" + echo "* REVISION: ${{ inputs.REVISION }}" + echo "* PUSH_IMAGES: ${{ inputs.PUSH_IMAGES }}" + echo "---------------------------------------------" + + - name: Checkout repository + uses: actions/checkout@v4 + with: + ref: ${{ inputs.DOCKER_REFERENCE }} + + - name: Log in to Docker Hub + uses: docker/login-action@v3 + with: + username: wazuh + password: ${{ secrets.DOCKERHUB_PASSWORD }} + + - name: Install Docker Compose + run: | + sudo apt-get update + sudo apt-get install -y docker-compose + echo "Installed Docker Compose version: $(docker-compose --version)" + + - name: Build Wazuh images + run: | + IMAGE_TAG=${{ inputs.IMAGE_TAG }} + FILEBEAT_MODULE_VERSION=${{ inputs.FILEBEAT_MODULE_VERSION }} + REVISION=${{ inputs.REVISION }} + PUSH_IMAGES=${{ inputs.PUSH_IMAGES }} + + if [[ "$IMAGE_TAG" == *"-"* ]]; then + IFS='-' read -r -a tokens <<< "$IMAGE_TAG" + if [ -z "${tokens[1]}" ]; then + echo "Invalid image tag: $IMAGE_TAG" + exit 1 + fi + DEV_STAGE=${tokens[1]} + WAZUH_VER=${tokens[0]} + ./build-docker-images/build-images.sh -v $WAZUH_VER -r $REVISION -d $DEV_STAGE -f $FILEBEAT_MODULE_VERSION + else + ./build-docker-images/build-images.sh -v $IMAGE_TAG -r $REVISION -f $FILEBEAT_MODULE_VERSION + fi + + ENV_FILE_PATH=".env" + # Save .env file contents to $GITHUB_ENV + if [ -f $ENV_FILE_PATH ]; then + while IFS= read -r line || [ -n "$line" ]; do + echo "$line" >> $GITHUB_ENV + done < $ENV_FILE_PATH + else + echo "The environment file $ENV_FILE_PATH does not exist!" + exit 1 + fi + + + - name: Tag and Push Wazuh images + if: ${{ inputs.PUSH_IMAGES }} + run: | + IMAGE_TAG=${{ inputs.IMAGE_TAG }} + IMAGE_NAMES=${{ inputs.PRODUCTS }} + IFS=',' read -r -a images <<< "$IMAGE_NAMES" + for image in "${images[@]}"; do + echo "Tagging and pushing wazuh/$image:${WAZUH_VERSION} to wazuh/$image:$IMAGE_TAG" + docker tag wazuh/$image:${WAZUH_VERSION} wazuh/$image:$IMAGE_TAG + docker push wazuh/$image:$IMAGE_TAG + done \ No newline at end of file diff --git a/build-docker-images/build-images.sh b/build-docker-images/build-images.sh index e37066a7..6a7b3f8a 100755 --- a/build-docker-images/build-images.sh +++ b/build-docker-images/build-images.sh @@ -70,7 +70,7 @@ build() { echo WAZUH_FILEBEAT_MODULE=$WAZUH_FILEBEAT_MODULE >> .env echo WAZUH_UI_REVISION=$WAZUH_UI_REVISION >> .env - docker-compose -f build-docker-images/build-images.yml --env-file .env build --no-cache + docker-compose -f build-docker-images/build-images.yml --env-file .env build --no-cache || clean 1 return 0 } From 84280fae08e088a473b1c323e72ffce18db0c1c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Correa=20Rodr=C3=ADguez?= Date: Fri, 13 Sep 2024 13:24:32 +0200 Subject: [PATCH 04/32] Updated SECURITY.md file --- SECURITY.md | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/SECURITY.md b/SECURITY.md index 54e59de1..86f56db8 100644 --- a/SECURITY.md +++ b/SECURITY.md @@ -16,11 +16,15 @@ Please submit your findings as security advisories under the "Security" tab in t ## Vulnerability Disclosure Policy Upon receiving a report of a potential vulnerability, our team will initiate an investigation. If the reported issue is confirmed as a vulnerability, we will take the following steps: -- Acknowledgment: We will acknowledge the receipt of your vulnerability report and begin our investigation. -- Validation: We will validate the issue and work on reproducing it in our environment. -- Remediation: We will work on a fix and thoroughly test it -- Release & Disclosure: After 90 days from the discovery of the vulnerability, or as soon as a fix is ready and thoroughly tested (whichever comes first), we will release a security update for the affected project. We will also publicly disclose the vulnerability by publishing a CVE (Common Vulnerabilities and Exposures) and acknowledging the discovering party. -- Exceptions: In order to preserve the security of the Wazuh community at large, we might extend the disclosure period to allow users to patch their deployments. +1. Acknowledgment: We will acknowledge the receipt of your vulnerability report and begin our investigation. + +2. Validation: We will validate the issue and work on reproducing it in our environment. + +3. Remediation: We will work on a fix and thoroughly test it. + +4. Release & Disclosure: After 90 days from the discovery of the vulnerability, or as soon as a fix is ready and thoroughly tested (whichever comes first), we will release a security update for the affected project. We will also publicly disclose the vulnerability by publishing a CVE (Common Vulnerabilities and Exposures) and acknowledging the discovering party. + +5. Exceptions: In order to preserve the security of the Wazuh community at large, we might extend the disclosure period to allow users to patch their deployments. This 90-day period allows for end-users to update their systems and minimizes the risk of widespread exploitation of the vulnerability. @@ -33,7 +37,7 @@ We believe in giving credit where credit is due. If you report a security vulner We do appreciate and encourage feedback from our community, but currently we do not have a bounty program. We might start bounty programs in the future. ## Compliance with this Policy -We consider the discovery and reporting of security vulnerabilities an important public service. We encourage responsible reporting of any vulnerabilities that may be found in our site or applications. +We consider the discovery and reporting of security vulnerabilities an important public service. We encourage responsible reporting of any vulnerabilities that may be found in our site or applications. Furthermore, we will not take legal action against or suspend or terminate access to the site or services of those who discover and report security vulnerabilities in accordance with this policy because of the fact. From 471aedae5b926c86e7144c10c151da5cc54c5ee4 Mon Sep 17 00:00:00 2001 From: "JESUS D. GARCIA" Date: Fri, 13 Sep 2024 11:15:04 -0500 Subject: [PATCH 05/32] Update changelog --- .github/workflows/Procedure_push_docker_images.yml | 2 +- CHANGELOG.md | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/Procedure_push_docker_images.yml b/.github/workflows/Procedure_push_docker_images.yml index 4dc4d0d4..79a813df 100644 --- a/.github/workflows/Procedure_push_docker_images.yml +++ b/.github/workflows/Procedure_push_docker_images.yml @@ -111,4 +111,4 @@ jobs: echo "Tagging and pushing wazuh/$image:${WAZUH_VERSION} to wazuh/$image:$IMAGE_TAG" docker tag wazuh/$image:${WAZUH_VERSION} wazuh/$image:$IMAGE_TAG docker push wazuh/$image:$IMAGE_TAG - done \ No newline at end of file + done diff --git a/CHANGELOG.md b/CHANGELOG.md index 36a4abe8..6e268497 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,7 @@ All notable changes to this project will be documented in this file. ## Wazuh Docker v4.10.0 ### Added +- Migrate the push docker images procedure to GitHub Actions ([#5651](https://github.com/wazuh/wazuh-qa/issues/5651)) - Update Wazuh to version [4.10.0](https://github.com/wazuh/wazuh/blob/v4.10.0/CHANGELOG.md#v4100) ## Wazuh Docker v4.9.1 From 4ea8fc266ec1c4adeb9b9c393018015fb2937829 Mon Sep 17 00:00:00 2001 From: c-bordon Date: Mon, 16 Sep 2024 15:17:18 -0300 Subject: [PATCH 06/32] Changed SECURITY.md file --- SECURITY.md | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/SECURITY.md b/SECURITY.md index 86f56db8..4d35ef4f 100644 --- a/SECURITY.md +++ b/SECURITY.md @@ -17,13 +17,9 @@ Please submit your findings as security advisories under the "Security" tab in t Upon receiving a report of a potential vulnerability, our team will initiate an investigation. If the reported issue is confirmed as a vulnerability, we will take the following steps: 1. Acknowledgment: We will acknowledge the receipt of your vulnerability report and begin our investigation. - 2. Validation: We will validate the issue and work on reproducing it in our environment. - -3. Remediation: We will work on a fix and thoroughly test it. - +3. Remediation: We will work on a fix and thoroughly test it 4. Release & Disclosure: After 90 days from the discovery of the vulnerability, or as soon as a fix is ready and thoroughly tested (whichever comes first), we will release a security update for the affected project. We will also publicly disclose the vulnerability by publishing a CVE (Common Vulnerabilities and Exposures) and acknowledging the discovering party. - 5. Exceptions: In order to preserve the security of the Wazuh community at large, we might extend the disclosure period to allow users to patch their deployments. This 90-day period allows for end-users to update their systems and minimizes the risk of widespread exploitation of the vulnerability. @@ -46,4 +42,4 @@ We ask that all users and contributors respect this policy and the security of o ## Changes to this Security Policy This policy may be revised from time to time. Each version of the policy will be identified at the top of the page by its effective date. -If you have any questions about this Security Policy, please contact us at [security@wazuh.com](mailto:security@wazuh.com). +If you have any questions about this Security Policy, please contact us at [security@wazuh.com](mailto:security@wazuh.com) From 3859ca38ec5dcb58130a8213571338286efedbaf Mon Sep 17 00:00:00 2001 From: Enrique Araque Date: Fri, 20 Sep 2024 12:46:28 +0200 Subject: [PATCH 07/32] Bump revision to 40911 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index d1732c32..a581c033 100644 --- a/VERSION +++ b/VERSION @@ -1,2 +1,2 @@ WAZUH-DOCKER_VERSION="4.9.1" -REVISION="40910" +REVISION="40911" From 9d851e63992a1b7ec321fa4a2aeba5ac572ebb84 Mon Sep 17 00:00:00 2001 From: Enrique Araque Date: Fri, 20 Sep 2024 12:54:10 +0200 Subject: [PATCH 08/32] Add rc1 tag to docker-compose files --- 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 d78454b4..5e35694d 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.9.1 + image: wazuh/wazuh-manager:4.9.1-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.9.1 + image: wazuh/wazuh-manager:4.9.1-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.9.1 + image: wazuh/wazuh-indexer:4.9.1-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.9.1 + image: wazuh/wazuh-indexer:4.9.1-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.9.1 + image: wazuh/wazuh-indexer:4.9.1-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.9.1 + image: wazuh/wazuh-dashboard:4.9.1-rc1 hostname: wazuh.dashboard restart: always ports: diff --git a/single-node/docker-compose.yml b/single-node/docker-compose.yml index a36491c7..505ac102 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.9.1 + image: wazuh/wazuh-manager:4.9.1-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.9.1 + image: wazuh/wazuh-indexer:4.9.1-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.9.1 + image: wazuh/wazuh-dashboard:4.9.1-rc1 hostname: wazuh.dashboard restart: always ports: From 189e875939a71d5ed7bcd0c94f7b12a9920433d3 Mon Sep 17 00:00:00 2001 From: Enrique Araque Date: Fri, 20 Sep 2024 13:00:53 +0200 Subject: [PATCH 09/32] Revert rc1 tag from docker compose files --- 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 5e35694d..d78454b4 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.9.1-rc1 + image: wazuh/wazuh-manager:4.9.1 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.9.1-rc1 + image: wazuh/wazuh-manager:4.9.1 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.9.1-rc1 + image: wazuh/wazuh-indexer:4.9.1 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.9.1-rc1 + image: wazuh/wazuh-indexer:4.9.1 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.9.1-rc1 + image: wazuh/wazuh-indexer:4.9.1 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.9.1-rc1 + image: wazuh/wazuh-dashboard:4.9.1 hostname: wazuh.dashboard restart: always ports: diff --git a/single-node/docker-compose.yml b/single-node/docker-compose.yml index 505ac102..a36491c7 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.9.1-rc1 + image: wazuh/wazuh-manager:4.9.1 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.9.1-rc1 + image: wazuh/wazuh-indexer:4.9.1 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.9.1-rc1 + image: wazuh/wazuh-dashboard:4.9.1 hostname: wazuh.dashboard restart: always ports: From 42db7176683eb23f09d2a6555d0c7d9b8db81b39 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Correa=20Rodr=C3=ADguez?= Date: Tue, 24 Sep 2024 08:50:11 +0200 Subject: [PATCH 10/32] Bumped revision for 4.10.0-alpha1 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index d945595e..aa7932ba 100644 --- a/VERSION +++ b/VERSION @@ -1,2 +1,2 @@ WAZUH-DOCKER_VERSION="4.10.0" -REVISION="41000" +REVISION="41001" From 8ab3018e62a74a27b2cead9b94301279667909a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Correa=20Rodr=C3=ADguez?= Date: Tue, 24 Sep 2024 09:28:31 +0200 Subject: [PATCH 11/32] Changed image tag for 4.10.0-alpha1 --- 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 89e3741b..a4e68876 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.10.0 + image: wazuh/wazuh-manager:4.10.0-alpha1 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.10.0 + image: wazuh/wazuh-manager:4.10.0-alpha1 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.10.0 + image: wazuh/wazuh-indexer:4.10.0-alpha1 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.10.0 + image: wazuh/wazuh-indexer:4.10.0-alpha1 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.10.0 + image: wazuh/wazuh-indexer:4.10.0-alpha1 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.10.0 + image: wazuh/wazuh-dashboard:4.10.0-alpha1 hostname: wazuh.dashboard restart: always ports: diff --git a/single-node/docker-compose.yml b/single-node/docker-compose.yml index a17a0368..75b27830 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.10.0 + image: wazuh/wazuh-manager:4.10.0-alpha1 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.10.0 + image: wazuh/wazuh-indexer:4.10.0-alpha1 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.10.0 + image: wazuh/wazuh-dashboard:4.10.0-alpha1 hostname: wazuh.dashboard restart: always ports: From 9e1c33245d21f0b05c00b05e6078c04ae8fd4e47 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Correa=20Rodr=C3=ADguez?= Date: Tue, 24 Sep 2024 09:32:47 +0200 Subject: [PATCH 12/32] Reverted image tag for 4.10.0-alpha1 --- 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 a4e68876..89e3741b 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.10.0-alpha1 + image: wazuh/wazuh-manager:4.10.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.10.0-alpha1 + image: wazuh/wazuh-manager:4.10.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.10.0-alpha1 + image: wazuh/wazuh-indexer:4.10.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.10.0-alpha1 + image: wazuh/wazuh-indexer:4.10.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.10.0-alpha1 + image: wazuh/wazuh-indexer:4.10.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.10.0-alpha1 + image: wazuh/wazuh-dashboard:4.10.0 hostname: wazuh.dashboard restart: always ports: diff --git a/single-node/docker-compose.yml b/single-node/docker-compose.yml index 75b27830..a17a0368 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.10.0-alpha1 + image: wazuh/wazuh-manager:4.10.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.10.0-alpha1 + image: wazuh/wazuh-indexer:4.10.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.10.0-alpha1 + image: wazuh/wazuh-dashboard:4.10.0 hostname: wazuh.dashboard restart: always ports: From 08ba82d16db8ea32d2a1da552ae4192f939d83e0 Mon Sep 17 00:00:00 2001 From: vcerenu Date: Tue, 24 Sep 2024 12:09:02 -0300 Subject: [PATCH 13/32] Bump new Wazuh 4.10.1 version --- .env | 6 +++--- .github/.goss.yaml | 2 +- .github/workflows/Procedure_push_docker_images.yml | 4 ++-- CHANGELOG.md | 5 +++++ README.md | 1 + VERSION | 4 ++-- build-docker-images/README.md | 4 ++-- build-docker-images/build-images.sh | 4 ++-- multi-node/docker-compose.yml | 12 ++++++------ single-node/docker-compose.yml | 6 +++--- 10 files changed, 27 insertions(+), 21 deletions(-) diff --git a/.env b/.env index 84f7370e..87fd140c 100755 --- a/.env +++ b/.env @@ -1,6 +1,6 @@ -WAZUH_VERSION=4.10.0 -WAZUH_IMAGE_VERSION=4.10.0 +WAZUH_VERSION=4.10.1 +WAZUH_IMAGE_VERSION=4.10.1 WAZUH_TAG_REVISION=1 -FILEBEAT_TEMPLATE_BRANCH=4.10.0 +FILEBEAT_TEMPLATE_BRANCH=4.10.1 WAZUH_FILEBEAT_MODULE=wazuh-filebeat-0.4.tar.gz WAZUH_UI_REVISION=1 diff --git a/.github/.goss.yaml b/.github/.goss.yaml index 41a65693..81b4347f 100644 --- a/.github/.goss.yaml +++ b/.github/.goss.yaml @@ -56,7 +56,7 @@ package: wazuh-manager: installed: true versions: - - 4.10.0-1 + - 4.10.1-1 port: tcp:1514: listening: true diff --git a/.github/workflows/Procedure_push_docker_images.yml b/.github/workflows/Procedure_push_docker_images.yml index 79a813df..9cf39fc5 100644 --- a/.github/workflows/Procedure_push_docker_images.yml +++ b/.github/workflows/Procedure_push_docker_images.yml @@ -6,11 +6,11 @@ on: inputs: IMAGE_TAG: description: 'Docker image tag' - default: '4.10.0' + default: '4.10.1' required: true DOCKER_REFERENCE: description: 'wazuh-docker reference' - default: 'v4.10.0' + default: 'v4.10.1' required: true PRODUCTS: description: 'Comma-separated list of the image names to build and push' diff --git a/CHANGELOG.md b/CHANGELOG.md index 6e268497..ad22820b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,11 @@ # Change Log All notable changes to this project will be documented in this file. +## Wazuh Docker v4.10.1 +### Added + +- Update Wazuh to version [4.10.1](https://github.com/wazuh/wazuh/blob/v4.10.1/CHANGELOG.md#v4101) + ## Wazuh Docker v4.10.0 ### Added diff --git a/README.md b/README.md index 135e7002..49ae756b 100644 --- a/README.md +++ b/README.md @@ -178,6 +178,7 @@ WAZUH_MONITORING_REPLICAS=0 ## | Wazuh version | ODFE | XPACK | |---------------|---------|--------| +| v4.10.1 | | | | v4.10.0 | | | | v4.9.1 | | | | v4.9.0 | | | diff --git a/VERSION b/VERSION index aa7932ba..e7740709 100644 --- a/VERSION +++ b/VERSION @@ -1,2 +1,2 @@ -WAZUH-DOCKER_VERSION="4.10.0" -REVISION="41001" +WAZUH-DOCKER_VERSION="4.10.1" +REVISION="41010" diff --git a/build-docker-images/README.md b/build-docker-images/README.md index 7541b7e6..e77766f1 100644 --- a/build-docker-images/README.md +++ b/build-docker-images/README.md @@ -13,7 +13,7 @@ This script initializes the environment variables needed to build each of the im The script allows you to build images from other versions of Wazuh, to do this you must use the -v or --version argument: ``` -$ build-docker-images/build-images.sh -v 4.10.0 +$ build-docker-images/build-images.sh -v 4.10.1 ``` To get all the available script options use the -h or --help option: @@ -26,7 +26,7 @@ Usage: build-docker-images/build-images.sh [OPTIONS] -d, --dev [Optional] Set the development stage you want to build, example rc1 or beta1, not used by default. -f, --filebeat-module [Optional] Set Filebeat module version. By default 0.4. -r, --revision [Optional] Package revision. By default 1 - -v, --version [Optional] Set the Wazuh version should be builded. By default, 4.10.0. + -v, --version [Optional] Set the Wazuh version should be builded. By default, 4.10.1. -h, --help Show this help. ``` \ No newline at end of file diff --git a/build-docker-images/build-images.sh b/build-docker-images/build-images.sh index 6a7b3f8a..26c2cd58 100755 --- a/build-docker-images/build-images.sh +++ b/build-docker-images/build-images.sh @@ -1,4 +1,4 @@ -WAZUH_IMAGE_VERSION=4.10.0 +WAZUH_IMAGE_VERSION=4.10.1 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') @@ -12,7 +12,7 @@ IMAGE_VERSION=${WAZUH_IMAGE_VERSION} # License (version 2) as published by the FSF - Free Software # Foundation. -WAZUH_IMAGE_VERSION="4.10.0" +WAZUH_IMAGE_VERSION="4.10.1" WAZUH_TAG_REVISION="1" WAZUH_DEV_STAGE="" FILEBEAT_MODULE_VERSION="0.4" diff --git a/multi-node/docker-compose.yml b/multi-node/docker-compose.yml index 89e3741b..2971d963 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.10.0 + image: wazuh/wazuh-manager:4.10.1 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.10.0 + image: wazuh/wazuh-manager:4.10.1 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.10.0 + image: wazuh/wazuh-indexer:4.10.1 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.10.0 + image: wazuh/wazuh-indexer:4.10.1 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.10.0 + image: wazuh/wazuh-indexer:4.10.1 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.10.0 + image: wazuh/wazuh-dashboard:4.10.1 hostname: wazuh.dashboard restart: always ports: diff --git a/single-node/docker-compose.yml b/single-node/docker-compose.yml index a17a0368..068171d6 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.10.0 + image: wazuh/wazuh-manager:4.10.1 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.10.0 + image: wazuh/wazuh-indexer:4.10.1 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.10.0 + image: wazuh/wazuh-dashboard:4.10.1 hostname: wazuh.dashboard restart: always ports: From eb4efb345833114d40bfb988961eb3a79ef9f81f Mon Sep 17 00:00:00 2001 From: c-bordon Date: Fri, 27 Sep 2024 09:05:56 -0300 Subject: [PATCH 14/32] Bump 4.9.1 revision --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index a581c033..ae36892c 100644 --- a/VERSION +++ b/VERSION @@ -1,2 +1,2 @@ WAZUH-DOCKER_VERSION="4.9.1" -REVISION="40911" +REVISION="40912" From 62ae93eee96b8fb9f4aadf24f0d0301df0e48699 Mon Sep 17 00:00:00 2001 From: c-bordon Date: Fri, 27 Sep 2024 09:18:13 -0300 Subject: [PATCH 15/32] Updated Wazuh images to -rc2 version --- 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 d78454b4..3ee093b4 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.9.1 + image: wazuh/wazuh-manager:4.9.1-rc2 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.9.1 + image: wazuh/wazuh-manager:4.9.1-rc2 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.9.1 + image: wazuh/wazuh-indexer:4.9.1-rc2 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.9.1 + image: wazuh/wazuh-indexer:4.9.1-rc2 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.9.1 + image: wazuh/wazuh-indexer:4.9.1-rc2 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.9.1 + image: wazuh/wazuh-dashboard:4.9.1-rc2 hostname: wazuh.dashboard restart: always ports: diff --git a/single-node/docker-compose.yml b/single-node/docker-compose.yml index a36491c7..52ccacb1 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.9.1 + image: wazuh/wazuh-manager:4.9.1-rc2 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.9.1 + image: wazuh/wazuh-indexer:4.9.1-rc2 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.9.1 + image: wazuh/wazuh-dashboard:4.9.1-rc2 hostname: wazuh.dashboard restart: always ports: From 0ec38df1c73e2ba75a85290715f379733cce0bd2 Mon Sep 17 00:00:00 2001 From: c-bordon Date: Fri, 27 Sep 2024 09:26:49 -0300 Subject: [PATCH 16/32] Revert Wazuh images to -rc2 version --- 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 3ee093b4..d78454b4 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.9.1-rc2 + image: wazuh/wazuh-manager:4.9.1 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.9.1-rc2 + image: wazuh/wazuh-manager:4.9.1 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.9.1-rc2 + image: wazuh/wazuh-indexer:4.9.1 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.9.1-rc2 + image: wazuh/wazuh-indexer:4.9.1 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.9.1-rc2 + image: wazuh/wazuh-indexer:4.9.1 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.9.1-rc2 + image: wazuh/wazuh-dashboard:4.9.1 hostname: wazuh.dashboard restart: always ports: diff --git a/single-node/docker-compose.yml b/single-node/docker-compose.yml index 52ccacb1..a36491c7 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.9.1-rc2 + image: wazuh/wazuh-manager:4.9.1 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.9.1-rc2 + image: wazuh/wazuh-indexer:4.9.1 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.9.1-rc2 + image: wazuh/wazuh-dashboard:4.9.1 hostname: wazuh.dashboard restart: always ports: From 027b26047f6bc862329e880b75b1c6c9c86955d9 Mon Sep 17 00:00:00 2001 From: "JESUS D. GARCIA" Date: Mon, 30 Sep 2024 16:20:31 -0500 Subject: [PATCH 17/32] Update Procedure_push_docker_images.yml --- .../Procedure_push_docker_images.yml | 103 +++++++++++++----- 1 file changed, 78 insertions(+), 25 deletions(-) diff --git a/.github/workflows/Procedure_push_docker_images.yml b/.github/workflows/Procedure_push_docker_images.yml index 79a813df..c27ae5d0 100644 --- a/.github/workflows/Procedure_push_docker_images.yml +++ b/.github/workflows/Procedure_push_docker_images.yml @@ -1,33 +1,84 @@ -run-name: Launch Push Docker Images - Executed by @${{ github.actor }} +run-name: Launch Push Docker Images - ${{ inputs.id }} name: Push Docker Images on: workflow_dispatch: inputs: - IMAGE_TAG: + image_tag: description: 'Docker image tag' default: '4.10.0' required: true - DOCKER_REFERENCE: + docker_reference: description: 'wazuh-docker reference' default: 'v4.10.0' - required: true - PRODUCTS: + required: false + products: description: 'Comma-separated list of the image names to build and push' default: 'wazuh-manager,wazuh-dashboard,wazuh-indexer' required: true - FILEBEAT_MODULE_VERSION: + filebeat_module_version: description: 'Filebeat module version' + default: '0.4' required: true - REVISION: + revision: description: 'Package revision' default: '1' required: true - PUSH_IMAGES: + push_images: description: 'Push images' type: boolean default: true required: true + id: + description: "ID used to identify the workflow uniquely." + type: string + required: false + dev: + description: "Add tag suffix '-dev' to the image tag ?" + type: boolean + default: false + required: false + workflow_call: + inputs: + image_tag: + description: 'Docker image tag' + default: '4.10.0' + required: true + type: string + docker_reference: + description: 'wazuh-docker reference' + default: 'v4.10.0' + required: false + type: string + products: + description: 'Comma-separated list of the image names to build and push' + default: 'wazuh-manager,wazuh-dashboard,wazuh-indexer' + required: true + type: string + filebeat_module_version: + description: 'Filebeat module version' + default: '0.4' + required: true + type: string + revision: + description: 'Package revision' + default: '1' + required: true + type: string + push_images: + description: 'Push images' + type: boolean + default: true + required: true + id: + description: "ID used to identify the workflow uniquely." + type: string + required: false + dev: + description: "Add tag suffix '-dev' to the image tag ?" + type: boolean + default: false + required: false jobs: build-and-push: @@ -44,23 +95,25 @@ jobs: echo "---------------------------------------------" echo "Inputs provided:" echo "---------------------------------------------" - echo "* IMAGE_TAG: ${{ inputs.IMAGE_TAG }}" - echo "* DOCKER_REFERENCE: ${{ inputs.DOCKER_REFERENCE }}" - echo "* PRODUCTS: ${{ inputs.PRODUCTS }}" - echo "* FILEBEAT_MODULE_VERSION: ${{ inputs.FILEBEAT_MODULE_VERSION }}" - echo "* REVISION: ${{ inputs.REVISION }}" - echo "* PUSH_IMAGES: ${{ inputs.PUSH_IMAGES }}" + echo "* id: ${{ inputs.id }}" + echo "* image_tag: ${{ inputs.image_tag }}" + echo "* docker_reference: ${{ inputs.docker_reference }}" + echo "* products: ${{ inputs.products }}" + echo "* filebeat_module_version: ${{ inputs.filebeat_module_version }}" + echo "* revision: ${{ inputs.revision }}" + echo "* push_images: ${{ inputs.push_images }}" + echo "* dev: ${{ inputs.dev }}" echo "---------------------------------------------" - name: Checkout repository uses: actions/checkout@v4 with: - ref: ${{ inputs.DOCKER_REFERENCE }} + ref: ${{ inputs.docker_reference }} - name: Log in to Docker Hub uses: docker/login-action@v3 with: - username: wazuh + username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_PASSWORD }} - name: Install Docker Compose @@ -71,10 +124,9 @@ jobs: - name: Build Wazuh images run: | - IMAGE_TAG=${{ inputs.IMAGE_TAG }} - FILEBEAT_MODULE_VERSION=${{ inputs.FILEBEAT_MODULE_VERSION }} - REVISION=${{ inputs.REVISION }} - PUSH_IMAGES=${{ inputs.PUSH_IMAGES }} + IMAGE_TAG=${{ inputs.image_tag }} + FILEBEAT_MODULE_VERSION=${{ inputs.filebeat_module_version }} + REVISION=${{ inputs.revision }} if [[ "$IMAGE_TAG" == *"-"* ]]; then IFS='-' read -r -a tokens <<< "$IMAGE_TAG" @@ -89,8 +141,9 @@ jobs: ./build-docker-images/build-images.sh -v $IMAGE_TAG -r $REVISION -f $FILEBEAT_MODULE_VERSION fi + # Save .env file (generated by build-images.sh) contents to $GITHUB_ENV ENV_FILE_PATH=".env" - # Save .env file contents to $GITHUB_ENV + if [ -f $ENV_FILE_PATH ]; then while IFS= read -r line || [ -n "$line" ]; do echo "$line" >> $GITHUB_ENV @@ -100,15 +153,15 @@ jobs: exit 1 fi - - name: Tag and Push Wazuh images - if: ${{ inputs.PUSH_IMAGES }} + if: ${{ inputs.push_images }} run: | - IMAGE_TAG=${{ inputs.IMAGE_TAG }} - IMAGE_NAMES=${{ inputs.PRODUCTS }} + IMAGE_TAG="${{ inputs.image_tag }}$( [ "${{ inputs.dev }}" == "true" ] && echo '-dev' || true )" + IMAGE_NAMES=${{ inputs.products }} IFS=',' read -r -a images <<< "$IMAGE_NAMES" for image in "${images[@]}"; do echo "Tagging and pushing wazuh/$image:${WAZUH_VERSION} to wazuh/$image:$IMAGE_TAG" docker tag wazuh/$image:${WAZUH_VERSION} wazuh/$image:$IMAGE_TAG + echo "Pushing wazuh/$image:$IMAGE_TAG ..." docker push wazuh/$image:$IMAGE_TAG done From 8bafe1295b4314fa55043bd81df83a5632806736 Mon Sep 17 00:00:00 2001 From: "JESUS D. GARCIA" Date: Tue, 1 Oct 2024 10:06:13 -0500 Subject: [PATCH 18/32] Change the dev default value to true for the workflow_dispatch --- .github/workflows/Procedure_push_docker_images.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/Procedure_push_docker_images.yml b/.github/workflows/Procedure_push_docker_images.yml index c27ae5d0..7ff8033d 100644 --- a/.github/workflows/Procedure_push_docker_images.yml +++ b/.github/workflows/Procedure_push_docker_images.yml @@ -36,7 +36,7 @@ on: dev: description: "Add tag suffix '-dev' to the image tag ?" type: boolean - default: false + default: true required: false workflow_call: inputs: From 92d0582201cc5c29135c289be3e5ea89fe6f3f1b Mon Sep 17 00:00:00 2001 From: Enrique Araque Date: Thu, 3 Oct 2024 13:18:25 +0200 Subject: [PATCH 19/32] Revert create_user.py script deletion --- .../wazuh-manager/config/etc/cont-init.d/2-manager | 1 - 1 file changed, 1 deletion(-) diff --git a/build-docker-images/wazuh-manager/config/etc/cont-init.d/2-manager b/build-docker-images/wazuh-manager/config/etc/cont-init.d/2-manager index 9e9aa995..0bd90fd6 100644 --- a/build-docker-images/wazuh-manager/config/etc/cont-init.d/2-manager +++ b/build-docker-images/wazuh-manager/config/etc/cont-init.d/2-manager @@ -93,7 +93,6 @@ EOF if /var/ossec/framework/python/bin/python3 /var/ossec/framework/scripts/create_user.py; then # remove json if exit code is 0 rm /var/ossec/api/configuration/admin.json - rm /var/ossec/framework/scripts/create_user.py else echored "There was an error configuring the API user" # terminate container to avoid unpredictable behavior From e6c5e82a32429b2341eec3e79bd0e7bd048db1de Mon Sep 17 00:00:00 2001 From: c-bordon Date: Thu, 3 Oct 2024 12:11:27 -0300 Subject: [PATCH 20/32] Bumped branch 4.10.2 to 4.10.2 version --- .env | 6 +++--- .github/.goss.yaml | 2 +- .github/workflows/Procedure_push_docker_images.yml | 4 ++-- CHANGELOG.md | 5 +++++ README.md | 1 + VERSION | 4 ++-- build-docker-images/README.md | 4 ++-- build-docker-images/build-images.sh | 4 ++-- multi-node/docker-compose.yml | 12 ++++++------ single-node/docker-compose.yml | 6 +++--- 10 files changed, 27 insertions(+), 21 deletions(-) diff --git a/.env b/.env index 87fd140c..a552278a 100755 --- a/.env +++ b/.env @@ -1,6 +1,6 @@ -WAZUH_VERSION=4.10.1 -WAZUH_IMAGE_VERSION=4.10.1 +WAZUH_VERSION=4.10.2 +WAZUH_IMAGE_VERSION=4.10.2 WAZUH_TAG_REVISION=1 -FILEBEAT_TEMPLATE_BRANCH=4.10.1 +FILEBEAT_TEMPLATE_BRANCH=4.10.2 WAZUH_FILEBEAT_MODULE=wazuh-filebeat-0.4.tar.gz WAZUH_UI_REVISION=1 diff --git a/.github/.goss.yaml b/.github/.goss.yaml index 81b4347f..1761d2c3 100644 --- a/.github/.goss.yaml +++ b/.github/.goss.yaml @@ -56,7 +56,7 @@ package: wazuh-manager: installed: true versions: - - 4.10.1-1 + - 4.10.2-1 port: tcp:1514: listening: true diff --git a/.github/workflows/Procedure_push_docker_images.yml b/.github/workflows/Procedure_push_docker_images.yml index 9cf39fc5..0ac167a9 100644 --- a/.github/workflows/Procedure_push_docker_images.yml +++ b/.github/workflows/Procedure_push_docker_images.yml @@ -6,11 +6,11 @@ on: inputs: IMAGE_TAG: description: 'Docker image tag' - default: '4.10.1' + default: '4.10.2' required: true DOCKER_REFERENCE: description: 'wazuh-docker reference' - default: 'v4.10.1' + default: 'v4.10.2' required: true PRODUCTS: description: 'Comma-separated list of the image names to build and push' diff --git a/CHANGELOG.md b/CHANGELOG.md index ad22820b..67dd51d3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,11 @@ # Change Log All notable changes to this project will be documented in this file. +## Wazuh Docker v4.10.2 +### Added + +- Update Wazuh to version [4.10.2](https://github.com/wazuh/wazuh/blob/v4.10.2/CHANGELOG.md#v4101) + ## Wazuh Docker v4.10.1 ### Added diff --git a/README.md b/README.md index 49ae756b..47a7ab7d 100644 --- a/README.md +++ b/README.md @@ -178,6 +178,7 @@ WAZUH_MONITORING_REPLICAS=0 ## | Wazuh version | ODFE | XPACK | |---------------|---------|--------| +| v4.10.2 | | | | v4.10.1 | | | | v4.10.0 | | | | v4.9.1 | | | diff --git a/VERSION b/VERSION index e7740709..42eb9ba1 100644 --- a/VERSION +++ b/VERSION @@ -1,2 +1,2 @@ -WAZUH-DOCKER_VERSION="4.10.1" -REVISION="41010" +WAZUH-DOCKER_VERSION="4.10.2" +REVISION="41020" diff --git a/build-docker-images/README.md b/build-docker-images/README.md index e77766f1..e65cda78 100644 --- a/build-docker-images/README.md +++ b/build-docker-images/README.md @@ -13,7 +13,7 @@ This script initializes the environment variables needed to build each of the im The script allows you to build images from other versions of Wazuh, to do this you must use the -v or --version argument: ``` -$ build-docker-images/build-images.sh -v 4.10.1 +$ build-docker-images/build-images.sh -v 4.10.2 ``` To get all the available script options use the -h or --help option: @@ -26,7 +26,7 @@ Usage: build-docker-images/build-images.sh [OPTIONS] -d, --dev [Optional] Set the development stage you want to build, example rc1 or beta1, not used by default. -f, --filebeat-module [Optional] Set Filebeat module version. By default 0.4. -r, --revision [Optional] Package revision. By default 1 - -v, --version [Optional] Set the Wazuh version should be builded. By default, 4.10.1. + -v, --version [Optional] Set the Wazuh version should be builded. By default, 4.10.2. -h, --help Show this help. ``` \ No newline at end of file diff --git a/build-docker-images/build-images.sh b/build-docker-images/build-images.sh index 26c2cd58..9d64121f 100755 --- a/build-docker-images/build-images.sh +++ b/build-docker-images/build-images.sh @@ -1,4 +1,4 @@ -WAZUH_IMAGE_VERSION=4.10.1 +WAZUH_IMAGE_VERSION=4.10.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') @@ -12,7 +12,7 @@ IMAGE_VERSION=${WAZUH_IMAGE_VERSION} # License (version 2) as published by the FSF - Free Software # Foundation. -WAZUH_IMAGE_VERSION="4.10.1" +WAZUH_IMAGE_VERSION="4.10.2" WAZUH_TAG_REVISION="1" WAZUH_DEV_STAGE="" FILEBEAT_MODULE_VERSION="0.4" diff --git a/multi-node/docker-compose.yml b/multi-node/docker-compose.yml index 2971d963..10187cfd 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.10.1 + image: wazuh/wazuh-manager:4.10.2 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.10.1 + image: wazuh/wazuh-manager:4.10.2 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.10.1 + image: wazuh/wazuh-indexer:4.10.2 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.10.1 + image: wazuh/wazuh-indexer:4.10.2 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.10.1 + image: wazuh/wazuh-indexer:4.10.2 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.10.1 + image: wazuh/wazuh-dashboard:4.10.2 hostname: wazuh.dashboard restart: always ports: diff --git a/single-node/docker-compose.yml b/single-node/docker-compose.yml index 068171d6..94cb7025 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.10.1 + image: wazuh/wazuh-manager:4.10.2 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.10.1 + image: wazuh/wazuh-indexer:4.10.2 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.10.1 + image: wazuh/wazuh-dashboard:4.10.2 hostname: wazuh.dashboard restart: always ports: From 884151b3220e0bcb42b59fcb75d9f3f7a5781587 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Correa=20Rodr=C3=ADguez?= Date: Fri, 4 Oct 2024 10:12:37 +0200 Subject: [PATCH 21/32] Bumped revision for 4.9.1-RC3 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index ae36892c..71e09963 100644 --- a/VERSION +++ b/VERSION @@ -1,2 +1,2 @@ WAZUH-DOCKER_VERSION="4.9.1" -REVISION="40912" +REVISION="40913" From 4177d1095cf6203e7bbdfe65bed77a779bcaf5ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Correa=20Rodr=C3=ADguez?= Date: Fri, 4 Oct 2024 10:23:16 +0200 Subject: [PATCH 22/32] Changed image tag for 4.9.1-rc3 --- 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 d78454b4..af6b58ea 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.9.1 + image: wazuh/wazuh-manager:4.9.1-rc3 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.9.1 + image: wazuh/wazuh-manager:4.9.1-rc3 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.9.1 + image: wazuh/wazuh-indexer:4.9.1-rc3 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.9.1 + image: wazuh/wazuh-indexer:4.9.1-rc3 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.9.1 + image: wazuh/wazuh-indexer:4.9.1-rc3 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.9.1 + image: wazuh/wazuh-dashboard:4.9.1-rc3 hostname: wazuh.dashboard restart: always ports: diff --git a/single-node/docker-compose.yml b/single-node/docker-compose.yml index a36491c7..a99c4327 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.9.1 + image: wazuh/wazuh-manager:4.9.1-rc3 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.9.1 + image: wazuh/wazuh-indexer:4.9.1-rc3 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.9.1 + image: wazuh/wazuh-dashboard:4.9.1-rc3 hostname: wazuh.dashboard restart: always ports: From 868c371c31920865177c71a1a5edbff7172236d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Correa=20Rodr=C3=ADguez?= Date: Fri, 4 Oct 2024 10:27:14 +0200 Subject: [PATCH 23/32] Reverted image tag for 4.9.1-rc3 --- 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 af6b58ea..d78454b4 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.9.1-rc3 + image: wazuh/wazuh-manager:4.9.1 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.9.1-rc3 + image: wazuh/wazuh-manager:4.9.1 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.9.1-rc3 + image: wazuh/wazuh-indexer:4.9.1 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.9.1-rc3 + image: wazuh/wazuh-indexer:4.9.1 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.9.1-rc3 + image: wazuh/wazuh-indexer:4.9.1 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.9.1-rc3 + image: wazuh/wazuh-dashboard:4.9.1 hostname: wazuh.dashboard restart: always ports: diff --git a/single-node/docker-compose.yml b/single-node/docker-compose.yml index a99c4327..a36491c7 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.9.1-rc3 + image: wazuh/wazuh-manager:4.9.1 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.9.1-rc3 + image: wazuh/wazuh-indexer:4.9.1 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.9.1-rc3 + image: wazuh/wazuh-dashboard:4.9.1 hostname: wazuh.dashboard restart: always ports: From 1aa149933be732c6cb8e459738b75dab68dc9c61 Mon Sep 17 00:00:00 2001 From: vcerenu Date: Thu, 10 Oct 2024 11:09:09 -0300 Subject: [PATCH 24/32] Fix typos --- .../wazuh-manager/config/etc/cont-init.d/0-wazuh-init | 2 +- .../wazuh-manager/config/etc/cont-init.d/1-config-filebeat | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build-docker-images/wazuh-manager/config/etc/cont-init.d/0-wazuh-init b/build-docker-images/wazuh-manager/config/etc/cont-init.d/0-wazuh-init index 326c46de..9edb1b00 100644 --- a/build-docker-images/wazuh-manager/config/etc/cont-init.d/0-wazuh-init +++ b/build-docker-images/wazuh-manager/config/etc/cont-init.d/0-wazuh-init @@ -51,7 +51,7 @@ mount_permanent_data() { print "Installing ${permanent_dir}" exec_cmd "cp -a ${data_tmp}. ${permanent_dir}" else - print "The path ${permanent_dir} is empty, skiped" + print "The path ${permanent_dir} is empty, skipped" fi fi done diff --git a/build-docker-images/wazuh-manager/config/etc/cont-init.d/1-config-filebeat b/build-docker-images/wazuh-manager/config/etc/cont-init.d/1-config-filebeat index c4a5c7f4..0a3ed8ff 100644 --- a/build-docker-images/wazuh-manager/config/etc/cont-init.d/1-config-filebeat +++ b/build-docker-images/wazuh-manager/config/etc/cont-init.d/1-config-filebeat @@ -4,7 +4,7 @@ set -e if [ "$INDEXER_URL" != "" ]; then - >&2 echo "Customize Elasticsearch ouput IP" + >&2 echo "Customize Elasticsearch output IP" sed -i "s|hosts:.*|hosts: ['$INDEXER_URL']|g" /etc/filebeat/filebeat.yml fi From f61af29c6bc6b6f3979c054f1f2f05090ec66b0e Mon Sep 17 00:00:00 2001 From: vcerenu Date: Thu, 10 Oct 2024 12:07:39 -0300 Subject: [PATCH 25/32] Add changelog --- CHANGELOG.md | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 648c293a..60e2ebec 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,10 +1,25 @@ # Change Log All notable changes to this project will be documented in this file. -## Wazuh Docker v4.9.1 +## [4.9.1] + ### Added -- Update Wazuh to version [4.9.1](https://github.com/wazuh/wazuh/blob/v4.9.1/CHANGELOG.md#v491) +- None + +### Changed + +- None + + +### Fixed + +- Fix typos into Wazuh manager entrypoint ([#1569](https://github.com/wazuh/wazuh-docker/pull/1569)) + +### Deleted + +- None + ## Wazuh Docker v4.9.0 ### Added From dbb776690d126c8f7845f3e27ca90fdcdf81aefa Mon Sep 17 00:00:00 2001 From: "JESUS D. GARCIA" Date: Thu, 10 Oct 2024 10:43:13 -0500 Subject: [PATCH 26/32] Bump revision --- CHANGELOG.md | 16 ++++++++++++++-- VERSION | 2 +- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6e268497..5086a476 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,11 +1,23 @@ # Change Log All notable changes to this project will be documented in this file. -## Wazuh Docker v4.10.0 +## [4.10.0] + ### Added - Migrate the push docker images procedure to GitHub Actions ([#5651](https://github.com/wazuh/wazuh-qa/issues/5651)) -- Update Wazuh to version [4.10.0](https://github.com/wazuh/wazuh/blob/v4.10.0/CHANGELOG.md#v4100) + +### Changed + +- None + +### Fixed + +- None + +### Deleted + +- None ## Wazuh Docker v4.9.1 ### Added diff --git a/VERSION b/VERSION index aa7932ba..9df77192 100644 --- a/VERSION +++ b/VERSION @@ -1,2 +1,2 @@ WAZUH-DOCKER_VERSION="4.10.0" -REVISION="41001" +REVISION="41002" From db4133d7a8ac3bb59e402cb0b970bd54017714be Mon Sep 17 00:00:00 2001 From: "JESUS D. GARCIA" Date: Thu, 10 Oct 2024 10:54:04 -0500 Subject: [PATCH 27/32] Update docker-compose versions --- 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 89e3741b..bb5bb3cd 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.10.0 + image: wazuh/wazuh-manager:4.10.0-alpha2 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.10.0 + image: wazuh/wazuh-manager:4.10.0-alpha2 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.10.0 + image: wazuh/wazuh-indexer:4.10.0-alpha2 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.10.0 + image: wazuh/wazuh-indexer:4.10.0-alpha2 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.10.0 + image: wazuh/wazuh-indexer:4.10.0-alpha2 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.10.0 + image: wazuh/wazuh-dashboard:4.10.0-alpha2 hostname: wazuh.dashboard restart: always ports: diff --git a/single-node/docker-compose.yml b/single-node/docker-compose.yml index a17a0368..995362c0 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.10.0 + image: wazuh/wazuh-manager:4.10.0-alpha2 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.10.0 + image: wazuh/wazuh-indexer:4.10.0-alpha2 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.10.0 + image: wazuh/wazuh-dashboard:4.10.0-alpha2 hostname: wazuh.dashboard restart: always ports: From 5795fa154dd5c1e6a5b68e2046ac862e854ff20c Mon Sep 17 00:00:00 2001 From: "JESUS D. GARCIA" Date: Thu, 10 Oct 2024 11:10:29 -0500 Subject: [PATCH 28/32] Revert image tag to 4.10.0 --- 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 bb5bb3cd..89e3741b 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.10.0-alpha2 + image: wazuh/wazuh-manager:4.10.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.10.0-alpha2 + image: wazuh/wazuh-manager:4.10.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.10.0-alpha2 + image: wazuh/wazuh-indexer:4.10.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.10.0-alpha2 + image: wazuh/wazuh-indexer:4.10.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.10.0-alpha2 + image: wazuh/wazuh-indexer:4.10.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.10.0-alpha2 + image: wazuh/wazuh-dashboard:4.10.0 hostname: wazuh.dashboard restart: always ports: diff --git a/single-node/docker-compose.yml b/single-node/docker-compose.yml index 995362c0..a17a0368 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.10.0-alpha2 + image: wazuh/wazuh-manager:4.10.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.10.0-alpha2 + image: wazuh/wazuh-indexer:4.10.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.10.0-alpha2 + image: wazuh/wazuh-dashboard:4.10.0 hostname: wazuh.dashboard restart: always ports: From 276c8a2e6c8c925e40e0e749c913b3427e910263 Mon Sep 17 00:00:00 2001 From: vcerenu Date: Tue, 15 Oct 2024 12:05:27 -0300 Subject: [PATCH 29/32] Bump revision --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 71e09963..12be3220 100644 --- a/VERSION +++ b/VERSION @@ -1,2 +1,2 @@ WAZUH-DOCKER_VERSION="4.9.1" -REVISION="40913" +REVISION="40914" From 564e2b3ec42f09b251f9edabb34bcc2fa0c493ab Mon Sep 17 00:00:00 2001 From: vcerenu Date: Tue, 15 Oct 2024 12:41:31 -0300 Subject: [PATCH 30/32] change image taf for rc4 --- 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 d78454b4..fc4d8587 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.9.1 + image: wazuh/wazuh-manager:4.9.1-rc4 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.9.1 + image: wazuh/wazuh-manager:4.9.1-rc4 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.9.1 + image: wazuh/wazuh-indexer:4.9.1-rc4 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.9.1 + image: wazuh/wazuh-indexer:4.9.1-rc4 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.9.1 + image: wazuh/wazuh-indexer:4.9.1-rc4 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.9.1 + image: wazuh/wazuh-dashboard:4.9.1-rc4 hostname: wazuh.dashboard restart: always ports: diff --git a/single-node/docker-compose.yml b/single-node/docker-compose.yml index a36491c7..a83eb6a2 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.9.1 + image: wazuh/wazuh-manager:4.9.1-rc4 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.9.1 + image: wazuh/wazuh-indexer:4.9.1-rc4 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.9.1 + image: wazuh/wazuh-dashboard:4.9.1-rc4 hostname: wazuh.dashboard restart: always ports: From 5bbacebe89078eed02dd823fce118a2a8592bf1b Mon Sep 17 00:00:00 2001 From: vcerenu Date: Tue, 15 Oct 2024 12:59:17 -0300 Subject: [PATCH 31/32] Revert image tag for rc4 --- 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 fc4d8587..d78454b4 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.9.1-rc4 + image: wazuh/wazuh-manager:4.9.1 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.9.1-rc4 + image: wazuh/wazuh-manager:4.9.1 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.9.1-rc4 + image: wazuh/wazuh-indexer:4.9.1 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.9.1-rc4 + image: wazuh/wazuh-indexer:4.9.1 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.9.1-rc4 + image: wazuh/wazuh-indexer:4.9.1 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.9.1-rc4 + image: wazuh/wazuh-dashboard:4.9.1 hostname: wazuh.dashboard restart: always ports: diff --git a/single-node/docker-compose.yml b/single-node/docker-compose.yml index a83eb6a2..a36491c7 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.9.1-rc4 + image: wazuh/wazuh-manager:4.9.1 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.9.1-rc4 + image: wazuh/wazuh-indexer:4.9.1 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.9.1-rc4 + image: wazuh/wazuh-dashboard:4.9.1 hostname: wazuh.dashboard restart: always ports: From 7ca14b9fc85b517452952b256b337f8619043cd1 Mon Sep 17 00:00:00 2001 From: vcerenu Date: Thu, 17 Oct 2024 12:34:40 -0300 Subject: [PATCH 32/32] Resolve conflicts --- .github/workflows/Procedure_push_docker_images.yml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/.github/workflows/Procedure_push_docker_images.yml b/.github/workflows/Procedure_push_docker_images.yml index 92015d55..3a627c25 100644 --- a/.github/workflows/Procedure_push_docker_images.yml +++ b/.github/workflows/Procedure_push_docker_images.yml @@ -10,15 +10,9 @@ on: required: true docker_reference: description: 'wazuh-docker reference' -<<<<<<< HEAD - default: 'v4.10.0' - required: false - products: -======= default: 'v4.10.1' required: true PRODUCTS: ->>>>>>> 46d6dc8fe58467e679fc57a86a5fe99394628b87 description: 'Comma-separated list of the image names to build and push' default: 'wazuh-manager,wazuh-dashboard,wazuh-indexer' required: true