yahoo_1999/fk-wazuh
1
0
Fork 0
forked from wazuh/wazuh-docker
Code Pull Requests Activity

Resolving conflicts

Browse Source
This commit is contained in:
Victor Carlos Erenu
2026-03-16 21:55:57 +07:00
parent 554cc10c5b 31df17e0f5
commit dab5cacd0b
2 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/workflows/Procedure_push_docker_images.yml
+6 -3
View File
@@ -65,7 +65,8 @@ permissions:
jobs: jobs:
setup: setup:
runs-on: ubuntu-22.04 runs-on:
group: wz-linux-amd64
outputs: outputs:
WAZUH_COMPONENTS: ${{ steps.compute-outputs.outputs.WAZUH_COMPONENTS }} WAZUH_COMPONENTS: ${{ steps.compute-outputs.outputs.WAZUH_COMPONENTS }}
@@ -135,7 +136,8 @@ jobs:
package-urls: package-urls:
name: generate package urls name: generate package urls
runs-on: ubuntu-22.04 runs-on:
group: wz-linux-amd64
needs: setup needs: setup
env: env:
@@ -314,7 +316,8 @@ jobs:
path: artifact_urls.yml path: artifact_urls.yml
build-and-push: build-and-push:
runs-on: ubuntu-22.04 runs-on:
group: wz-linux-amd64
needs: needs:
- setup - setup
CHANGELOG.md
+3 -2
View File
@@ -10,6 +10,7 @@ All notable changes to this project will be documented in this file.
### Changed ### Changed
- Add deployment healthchecks ([#2251](https://github.com/wazuh/wazuh-docker/pull/2251)) - 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)) - 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)) - 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)) - 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 ### 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 ### Fixed
- None - INDEXER_URL substitution fix ([#2226](https://github.com/wazuh/wazuh-docker/pull/2226))
### Deleted ### Deleted