yahoo_1999/fk-wazuh
1
0
Fork 0
forked from wazuh/wazuh-docker
Code Pull Requests Activity

Added assistant revision input to the build workflow

Browse Source
This commit is contained in:
Carlos Bordon
2026-03-19 15:30:34 -03:00
parent fc034c872d
commit d374891660
2 changed files with 20 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/workflows/5_pr_check.yml
+2 -1
View File
@@ -45,7 +45,8 @@ jobs:
image_tag: ${{ needs.prepare-variables.outputs.WAZUH_IMAGE_VERSION }} image_tag: ${{ needs.prepare-variables.outputs.WAZUH_IMAGE_VERSION }}
docker_reference: ${{ github.head_ref || inputs.docker_reference }} docker_reference: ${{ github.head_ref || inputs.docker_reference }}
wazuh_automation_reference: 'main' wazuh_automation_reference: 'main'
commit_list: '["latest", "latest", "latest", "latest", "latest"]' commit_list: '["latest", "latest", "latest", "latest"]'
assistant_revision: 'latest'
id: ${{ github.run_id }} id: ${{ github.run_id }}
dev: true dev: true
.github/workflows/Procedure_push_docker_images.yml
+18 -8
View File
@@ -17,13 +17,18 @@ on:
default: 'main' 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,wazuh-assistant' default: 'wazuh-manager,wazuh-dashboard,wazuh-indexer,wazuh-agent'
required: false required: false
type: string type: string
commit_list: commit_list:
description: 'Wazuh components revisions (only for dev): json array with commit-hash for each product' description: 'Wazuh components revisions (only for dev): json array with commit-hash for each product'
type: string type: string
default: '["latest", "latest", "latest", "latest", "latest"]' default: '["latest", "latest", "latest", "latest"]'
assistant_revision:
description: 'Revision for Wazuh installation assistant tools like Wazuh password tool (only for dev)'
type: string
default: 'latest'
required: false
id: id:
description: "ID used to identify the workflow uniquely." description: "ID used to identify the workflow uniquely."
type: string type: string
@@ -51,13 +56,18 @@ on:
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'
default: 'wazuh-manager,wazuh-dashboard,wazuh-indexer,wazuh-agent,wazuh-assistant' default: 'wazuh-manager,wazuh-dashboard,wazuh-indexer,wazuh-agent'
required: false required: false
type: string type: string
commit_list: commit_list:
description: 'Wazuh components revisions (only for dev): json array with commit-hash for each product' description: 'Wazuh components revisions (only for dev): json array with commit-hash for each product'
type: string type: string
default: '["latest", "latest", "latest", "latest", "latest"]' default: '["latest", "latest", "latest", "latest"]'
assistant_revision:
description: 'Revision for Wazuh installation assistant tools like Wazuh password tool (only for dev)'
type: string
default: 'latest'
required: false
id: id:
description: "ID used to identify the workflow uniquely." description: "ID used to identify the workflow uniquely."
type: string type: string
@@ -95,9 +105,11 @@ jobs:
echo "* id: ${{ inputs.id }}" echo "* id: ${{ inputs.id }}"
echo "* image_tag: ${{ inputs.image_tag }}" echo "* image_tag: ${{ inputs.image_tag }}"
echo "* docker_reference: ${{ inputs.docker_reference }}" echo "* docker_reference: ${{ inputs.docker_reference }}"
echo "* wazuh_automation_reference: ${{ inputs.wazuh_automation_reference }}"
echo "* products: ${{ inputs.products }}" echo "* products: ${{ inputs.products }}"
echo "* dev: ${{ inputs.dev }}" echo "* dev: ${{ inputs.dev }}"
echo "* commit_list: ${{ inputs.commit_list }}" echo "* commit_list: ${{ inputs.commit_list }}"
echo "* assistant_revision: ${{ inputs.assistant_revision }}"
echo "---------------------------------------------" echo "---------------------------------------------"
- name: Set up variables - name: Set up variables
@@ -117,7 +129,7 @@ jobs:
done done
WC_JSON_ARRAY+="]" WC_JSON_ARRAY+="]"
else else
WC_JSON_ARRAY='["wazuh-manager","wazuh-dashboard","wazuh-indexer","wazuh-agent","wazuh-assistant"]' WC_JSON_ARRAY='["wazuh-manager","wazuh-dashboard","wazuh-indexer","wazuh-agent"]'
fi fi
echo "Products to build: $WC_JSON_ARRAY" echo "Products to build: $WC_JSON_ARRAY"
echo "WAZUH_COMPONENTS=$WC_JSON_ARRAY" >> $GITHUB_OUTPUT echo "WAZUH_COMPONENTS=$WC_JSON_ARRAY" >> $GITHUB_OUTPUT
@@ -155,6 +167,7 @@ jobs:
PRESIGNED_URLS_SCRIPT_PROCESS: "build_docker" PRESIGNED_URLS_SCRIPT_PROCESS: "build_docker"
LOCAL_ARTIFACT_URLS_FILEPATH: /tmp/artifact_urls.yml LOCAL_ARTIFACT_URLS_FILEPATH: /tmp/artifact_urls.yml
COMMIT_LIST: ${{ inputs.commit_list }} COMMIT_LIST: ${{ inputs.commit_list }}
ASSISTANT_REVISION: ${{ inputs.assistant_revision }}
steps: steps:
- name: Checkout repository - name: Checkout repository
@@ -250,9 +263,6 @@ jobs:
wazuh-agent) wazuh-agent)
AGENT_REVISION="${REVISIONS[$i]}" AGENT_REVISION="${REVISIONS[$i]}"
;; ;;
wazuh-assistant)
ASSISTANT_REVISION="${REVISIONS[$i]}"
;;
esac esac
done done