Resolving conflicts

.github/workflows/Procedure_push_docker_images.yml

@@ -65,7 +65,8 @@ permissions:
 
 jobs:
   setup:
-    runs-on: ubuntu-22.04
+    runs-on:
+      group: wz-linux-amd64
 
     outputs:
       WAZUH_COMPONENTS: ${{ steps.compute-outputs.outputs.WAZUH_COMPONENTS }}
@@ -135,7 +136,8 @@ jobs:
 
   package-urls:
     name: generate package urls
-    runs-on: ubuntu-22.04
+    runs-on:
+      group: wz-linux-amd64
     needs: setup
 
     env:
@@ -314,7 +316,8 @@ jobs:
           path: artifact_urls.yml
 
   build-and-push:
-    runs-on: ubuntu-22.04
+    runs-on:
+      group: wz-linux-amd64
 
     needs:
       - setup

CHANGELOG.md

@@ -10,6 +10,7 @@ All notable changes to this project will be documented in this file.
 ### Changed
 
 - Add deployment healthchecks ([#2251](https://github.com/wazuh/wazuh-docker/pull/2251))
+- Update artifact generation jobs to use wz-linux dedicated runner group ([#2242](https://github.com/wazuh/wazuh-docker/pull/2242))
 - Fix set_correct_permOwner function ([#2238](https://github.com/wazuh/wazuh-docker/pull/2238))
 - Add workflow dispatch option ([#2231](https://github.com/wazuh/wazuh-docker/pull/2231))
 - Change Wazuh manager certificates names ([#2223](https://github.com/wazuh/wazuh-docker/pull/2223))
@@ -68,11 +69,11 @@ All notable changes to this project will be documented in this file.
 
 ### Changed
 
-- Backport from 5.0.0: Backport from 5.0.0: Allow building separate targets #2177 ([#2184](https://github.com/wazuh/wazuh-docker/pull/2184))
+- Backport from 5.0.0: Allow building separate targets #2177 ([#2184](https://github.com/wazuh/wazuh-docker/pull/2184))
 
 ### Fixed
 
-- None
+- INDEXER_URL substitution fix ([#2226](https://github.com/wazuh/wazuh-docker/pull/2226))
 
 ### Deleted