mirror of
https://github.com/wazuh/wazuh-docker.git
synced 2025-10-23 04:51:57 +00:00
Resolve conflicts
This commit is contained in:
@@ -10,15 +10,9 @@ on:
|
||||
required: true
|
||||
docker_reference:
|
||||
description: 'wazuh-docker reference'
|
||||
<<<<<<< HEAD
|
||||
default: 'v4.10.0'
|
||||
required: false
|
||||
products:
|
||||
=======
|
||||
default: 'v4.10.1'
|
||||
required: true
|
||||
PRODUCTS:
|
||||
>>>>>>> 46d6dc8fe58467e679fc57a86a5fe99394628b87
|
||||
description: 'Comma-separated list of the image names to build and push'
|
||||
default: 'wazuh-manager,wazuh-dashboard,wazuh-indexer'
|
||||
required: true
|
||||
|
Reference in New Issue
Block a user