Resoliving conflicts

This commit is contained in:
Victor Carlos Erenu
2026-07-25 01:37:44 +07:00
parent 8e6e8e54ea
commit a55fba80e4
3 changed files with 4 additions and 24 deletions
@@ -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'
@@ -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'
@@ -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'
+1 -21
View File
@@ -19,24 +19,4 @@ All notable changes to this project will be documented in this file.
- None
## [v5.0.1]
### Added
- None
### Changed
- None
### Removed
- None
### Fixed
- None
## Prior version
- [v5.0.0](https://github.com/wazuh/wazuh-docker/blob/v5.0.0/CHANGELOG.md)
- [v5.0.1](https://github.com/wazuh/wazuh-docker/blob/v5.0.1/CHANGELOG.md)