Resolving merge conflicts

.github/workflows/4_build_and_push_images.yml

@@ -213,6 +213,10 @@ jobs:
 
   notify:
     runs-on: codebuild-github-actions-codebuild-runner-devops-amd-${{ github.run_id }}-${{ github.run_attempt }}
+
+    permissions:
+      contents: read
+
     needs: [setup, build-and-push]
     # Only run if NOT dev AND all products were selected
     if: ${{ inputs.dev == false && needs.setup.outputs.ALL_PRODUCTS_SELECTED == 'true' }}

.github/workflows/4_pr_check.yml

@@ -12,6 +12,9 @@ on:
       - 'wazuh-agent/**'
       - '.github/**'
 
+permissions:
+  contents: read
+
 env:
   ARTIFACTS_LOCAL_DIR: /home/runner/work/wazuh-docker/wazuh-docker/docker-images
   ARTIFACT_NAMES: |

.github/workflows/5_build_and_push_images.yml

@@ -6,7 +6,7 @@ on:
     inputs:
       image_tag:
         description: 'Docker image tag'
-        default: '5.0.1'
+        default: '5.1.0'
         required: true
       docker_reference:
         description: 'wazuh-docker reference'
@@ -14,7 +14,7 @@ on:
       wazuh_automation_reference:
         description: 'Branch or tag of the wazuh-automation repository'
         required: false
-        default: '5.0.1'
+        default: 'main'
       products:
         description: 'Comma-separated list of the image names to build and push'
         default: 'wazuh-manager,wazuh-dashboard,wazuh-indexer,wazuh-agent'
@@ -42,7 +42,7 @@ on:
     inputs:
       image_tag:
         description: 'Docker image tag'
-        default: '5.0.1'
+        default: '5.1.0'
         required: true
         type: string
       docker_reference:
@@ -52,7 +52,7 @@ on:
       wazuh_automation_reference:
         description: 'Branch or tag of the wazuh-automation repository'
         required: false
-        default: '5.0.1'
+        default: 'main'
         type: string
       products:
         description: 'Comma-separated list of the image names to build and push'

.github/workflows/5_check_integration_tools.yml

@@ -16,7 +16,7 @@ on:
       automation_reference:
         description: 'Branch of wazuh-automation to use'
         required: false
-        default: '5.0.1'
+        default: 'main'
         type: string
       deployment_type:
         description: 'Deployment type to test'
@@ -27,7 +27,7 @@ on:
           - multi-node
           - both
       version:
-        description: 'Image version to test (e.g. 5.0.1).'
+        description: 'Image version to test (e.g. 5.1.0).'
         required: false
         type: string
       stage: