Merge pull request #1582 from wazuh/merge-4.10.0-into-4.10.1

Merge 4.10.0 into 4.10.1
2024-10-17 12:42:06 -03:00
parent 46d6dc8fe5 7ca14b9fc8
commit ea0e679c27
5 changed files with 124 additions and 32 deletions
@@ -1,14 +1,14 @@
-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.1'
        required: true
-      DOCKER_REFERENCE:
+      docker_reference:
        description: 'wazuh-docker reference'
        default: 'v4.10.1'
        required: true
@@ -16,18 +16,69 @@ on:
        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: true
+        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
@@ -1,21 +1,61 @@
 # Change Log
 All notable changes to this project will be documented in this file.

-## Wazuh Docker v4.10.1
+## [4.10.1]
+
 ### Added

- Update Wazuh to version [4.10.1](https://github.com/wazuh/wazuh/blob/v4.10.1/CHANGELOG.md#v4101)
+- none
+
+### Changed
+
+- None
+
+### Fixed
+
+- None
+
+### Deleted
+
+- None
+
+## [4.10.0]

-## 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
+### Changed
+
+- None
+
+### Fixed
+
+- None
+
+### Deleted
+
+- None
+
+## [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
@@ -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
@@ -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

@@ -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