forked from wazuh/wazuh-docker
Resoliving conflicts
This commit is contained in:
@@ -14,7 +14,7 @@ on:
|
|||||||
wazuh_automation_reference:
|
wazuh_automation_reference:
|
||||||
description: 'Branch or tag of the wazuh-automation repository'
|
description: 'Branch or tag of the wazuh-automation repository'
|
||||||
required: false
|
required: false
|
||||||
default: '5.0.1'
|
default: 'main'
|
||||||
products:
|
products:
|
||||||
description: 'Comma-separated list of the image names to build and push'
|
description: 'Comma-separated list of the image names to build and push'
|
||||||
default: 'wazuh-manager,wazuh-dashboard,wazuh-indexer,wazuh-agent'
|
default: 'wazuh-manager,wazuh-dashboard,wazuh-indexer,wazuh-agent'
|
||||||
@@ -52,7 +52,7 @@ on:
|
|||||||
wazuh_automation_reference:
|
wazuh_automation_reference:
|
||||||
description: 'Branch or tag of the wazuh-automation repository'
|
description: 'Branch or tag of the wazuh-automation repository'
|
||||||
required: false
|
required: false
|
||||||
default: '5.0.1'
|
default: 'main'
|
||||||
type: string
|
type: string
|
||||||
products:
|
products:
|
||||||
description: 'Comma-separated list of the image names to build and push'
|
description: 'Comma-separated list of the image names to build and push'
|
||||||
|
|||||||
@@ -16,7 +16,7 @@ on:
|
|||||||
automation_reference:
|
automation_reference:
|
||||||
description: 'Branch of wazuh-automation to use'
|
description: 'Branch of wazuh-automation to use'
|
||||||
required: false
|
required: false
|
||||||
default: '5.0.1'
|
default: 'main'
|
||||||
type: string
|
type: string
|
||||||
deployment_type:
|
deployment_type:
|
||||||
description: 'Deployment type to test'
|
description: 'Deployment type to test'
|
||||||
|
|||||||
+1
-21
@@ -19,24 +19,4 @@ All notable changes to this project will be documented in this file.
|
|||||||
|
|
||||||
- None
|
- None
|
||||||
|
|
||||||
## [v5.0.1]
|
- [v5.0.1](https://github.com/wazuh/wazuh-docker/blob/v5.0.1/CHANGELOG.md)
|
||||||
|
|
||||||
### 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)
|
|
||||||
|
|||||||
Reference in New Issue
Block a user