mirror of
https://github.com/wazuh/wazuh-docker.git
synced 2025-10-29 02:53:41 +00:00
Resolve conflicts
This commit is contained in:
@@ -10,15 +10,9 @@ on:
|
|||||||
required: true
|
required: true
|
||||||
docker_reference:
|
docker_reference:
|
||||||
description: 'wazuh-docker reference'
|
description: 'wazuh-docker reference'
|
||||||
<<<<<<< HEAD
|
|
||||||
default: 'v4.10.0'
|
|
||||||
required: false
|
|
||||||
products:
|
|
||||||
=======
|
|
||||||
default: 'v4.10.1'
|
default: 'v4.10.1'
|
||||||
required: true
|
required: true
|
||||||
PRODUCTS:
|
PRODUCTS:
|
||||||
>>>>>>> 46d6dc8fe58467e679fc57a86a5fe99394628b87
|
|
||||||
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'
|
default: 'wazuh-manager,wazuh-dashboard,wazuh-indexer'
|
||||||
required: true
|
required: true
|
||||||
|
|||||||
Reference in New Issue
Block a user