Resolving merge conflicts

.github/.goss.yaml

@@ -56,7 +56,7 @@ package:
   wazuh-manager:
     installed: true
     versions:
-    - 4.11.0
+    - 4.12.0
 port:
   tcp:1514:
     listening: true

.github/free-disk-space/action.yml

@@ -242,4 +242,4 @@ runs:
         echo "/dev/root:"
         printSavedSpace $((AVAILABLE_ROOT_END - AVAILABLE_ROOT_INITIAL))
         echo "overall:"
-        printSavedSpace $((AVAILABLE_END - AVAILABLE_INITIAL))
+        printSavedSpace $((AVAILABLE_END - AVAILABLE_INITIAL))

.github/workflows/Procedure_push_docker_images.yml

@@ -6,11 +6,11 @@ on:
     inputs:
       image_tag:
         description: 'Docker image tag'
-        default: '4.11.0'
+        default: '4.12.0'
         required: true
       docker_reference:
         description: 'wazuh-docker reference'
-        default: 'v4.11.0'
+        default: 'v4.12.0'
         required: true
       products:
         description: 'Comma-separated list of the image names to build and push'
@@ -42,12 +42,12 @@ on:
     inputs:
       image_tag:
         description: 'Docker image tag'
-        default: '4.11.0'
+        default: '4.12.0'
         required: true
         type: string
       docker_reference:
         description: 'wazuh-docker reference'
-        default: 'v4.11.0'
+        default: 'v4.12.0'
         required: false
         type: string
       products:
@@ -82,7 +82,7 @@ on:
 
 jobs:
   build-and-push:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
 
     steps:
     - name: Print inputs

.github/workflows/push.yml

@@ -4,7 +4,7 @@ on: [pull_request]
 
 jobs:
   build-docker-images:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     steps:
 
     - name: Check out code
@@ -61,7 +61,7 @@ jobs:
         GOSS_FILE: .github/.goss.yaml
 
   check-single-node:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     needs: build-docker-images
     steps:
 
@@ -189,7 +189,7 @@ jobs:
       run: ./.github/single-node-log-check.sh
 
   check-multi-node:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     needs: build-docker-images
     steps:
 

.github/workflows/trivy-dashboard.yml

@@ -27,7 +27,7 @@ jobs:
       security-events: write # for github/codeql-action/upload-sarif to upload SARIF results
 
     name: Build images and upload Trivy results
-    runs-on: "ubuntu-latest"
+    runs-on: "ubuntu-22.04"
     steps:
       - name: Checkout code
         uses: actions/checkout@v3

.github/workflows/trivy-indexer.yml

@@ -27,7 +27,7 @@ jobs:
       security-events: write # for github/codeql-action/upload-sarif to upload SARIF results
 
     name: Build images and upload Trivy results
-    runs-on: "ubuntu-latest"
+    runs-on: "ubuntu-22.04"
     steps:
       - name: Checkout code
         uses: actions/checkout@v3

.github/workflows/trivy-manager.yml

@@ -27,7 +27,7 @@ jobs:
       security-events: write # for github/codeql-action/upload-sarif to upload SARIF results
 
     name: Build images and upload Trivy results
-    runs-on: "ubuntu-latest"
+    runs-on: "ubuntu-22.04"
     steps:
       - name: Checkout code
         uses: actions/checkout@v3