mirror of
https://github.com/wazuh/wazuh-docker.git
synced 2025-10-23 06:11:57 +00:00
Resolving conflicts
This commit is contained in:
2
.github/.goss.yaml
vendored
2
.github/.goss.yaml
vendored
@@ -56,7 +56,7 @@ package:
|
||||
wazuh-manager:
|
||||
installed: true
|
||||
versions:
|
||||
- 4.12.2
|
||||
- 4.13.0
|
||||
port:
|
||||
tcp:1514:
|
||||
listening: true
|
||||
|
@@ -6,11 +6,10 @@ on:
|
||||
inputs:
|
||||
image_tag:
|
||||
description: 'Docker image tag'
|
||||
default: '4.12.2'
|
||||
default: '4.13.0'
|
||||
required: true
|
||||
docker_reference:
|
||||
description: 'wazuh-docker reference'
|
||||
default: 'v4.12.2'
|
||||
required: true
|
||||
products:
|
||||
description: 'Comma-separated list of the image names to build and push'
|
||||
@@ -42,12 +41,11 @@ on:
|
||||
inputs:
|
||||
image_tag:
|
||||
description: 'Docker image tag'
|
||||
default: '4.12.2'
|
||||
default: '4.13.0'
|
||||
required: true
|
||||
type: string
|
||||
docker_reference:
|
||||
description: 'wazuh-docker reference'
|
||||
default: 'v4.12.2'
|
||||
required: false
|
||||
type: string
|
||||
products:
|
||||
|
3
.github/workflows/trivy-dashboard.yml
vendored
3
.github/workflows/trivy-dashboard.yml
vendored
@@ -11,8 +11,7 @@ on:
|
||||
- published
|
||||
pull_request:
|
||||
branches:
|
||||
- master
|
||||
- stable
|
||||
- main
|
||||
schedule:
|
||||
- cron: '34 2 * * 1'
|
||||
workflow_dispatch:
|
||||
|
3
.github/workflows/trivy-indexer.yml
vendored
3
.github/workflows/trivy-indexer.yml
vendored
@@ -11,8 +11,7 @@ on:
|
||||
- published
|
||||
pull_request:
|
||||
branches:
|
||||
- master
|
||||
- stable
|
||||
- main
|
||||
schedule:
|
||||
- cron: '34 2 * * 1'
|
||||
workflow_dispatch:
|
||||
|
3
.github/workflows/trivy-manager.yml
vendored
3
.github/workflows/trivy-manager.yml
vendored
@@ -11,8 +11,7 @@ on:
|
||||
- published
|
||||
pull_request:
|
||||
branches:
|
||||
- master
|
||||
- stable
|
||||
- main
|
||||
schedule:
|
||||
- cron: '34 2 * * 1'
|
||||
workflow_dispatch:
|
||||
|
Reference in New Issue
Block a user