Resolve conflicts

This commit is contained in:
vcerenu
2024-10-17 13:04:31 -03:00
35 changed files with 839 additions and 630 deletions
@@ -6,11 +6,11 @@ on:
inputs:
image_tag:
description: 'Docker image tag'
default: '4.10.2'
default: '5.0.0'
required: true
docker_reference:
description: 'wazuh-docker reference'
default: 'v4.10.2'
default: 'v5.0.0'
required: true
PRODUCTS:
description: 'Comma-separated list of the image names to build and push'
@@ -42,12 +42,12 @@ on:
inputs:
image_tag:
description: 'Docker image tag'
default: '4.10.0'
default: '5.0.0'
required: true
type: string
docker_reference:
description: 'wazuh-docker reference'
default: 'v4.10.0'
default: 'v5.0.0'
required: false
type: string
products: