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

Resolving conflicts

Browse Source
This commit is contained in:
Victor Carlos Erenu
2026-04-25 01:33:21 +07:00
parent ebbf3b585f 3384ccbc9b
commit 75959484f3
2 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/workflows/Procedure_push_docker_images.yml
+10 -12
View File
@@ -233,6 +233,11 @@ jobs:
source ${{ env.WORKFLOW_VENV }}/bin/activate source ${{ env.WORKFLOW_VENV }}/bin/activate
WAZUH_COMPONENTS='${{ needs.setup.outputs.WAZUH_COMPONENTS }}' WAZUH_COMPONENTS='${{ needs.setup.outputs.WAZUH_COMPONENTS }}'
COMMIT_LIST='${{ needs.setup.outputs.COMMIT_LIST }}' COMMIT_LIST='${{ needs.setup.outputs.COMMIT_LIST }}'
SCRIPT_PARAMS="--process ${{ env.PRESIGNED_URLS_SCRIPT_PROCESS }} \
--wazuh-version ${{ env.WAZUH_VERSION }} \
--aws-s3-bucket-dev ${{ env.LOCAL_AWS_S3_BUCKET_DEV }} \
--assistant-revision $ASSISTANT_REVISION "
# Parse components and their revisions # Parse components and their revisions
COMPONENTS=($(echo "$WAZUH_COMPONENTS" | jq -r '.[]')) COMPONENTS=($(echo "$WAZUH_COMPONENTS" | jq -r '.[]'))
@@ -251,29 +256,22 @@ jobs:
for i in "${!COMPONENTS[@]}"; do for i in "${!COMPONENTS[@]}"; do
case "${COMPONENTS[$i]}" in case "${COMPONENTS[$i]}" in
wazuh-manager) wazuh-manager)
MANAGER_REVISION="${REVISIONS[$i]}" SCRIPT_PARAMS+="--manager-revision ${REVISIONS[$i]} "
;; ;;
wazuh-dashboard) wazuh-dashboard)
DASHBOARD_REVISION="${REVISIONS[$i]}" SCRIPT_PARAMS+="--dashboard-revision ${REVISIONS[$i]} "
;; ;;
wazuh-indexer) wazuh-indexer)
INDEXER_REVISION="${REVISIONS[$i]}" SCRIPT_PARAMS+="--indexer-revision ${REVISIONS[$i]} "
;; ;;
wazuh-agent) wazuh-agent)
AGENT_REVISION="${REVISIONS[$i]}" SCRIPT_PARAMS+="--agent-revision ${REVISIONS[$i]} "
;; ;;
esac esac
done done
python ${{ env.GENERATE_PRESIGNED_URLS_SCRIPT_PATH }} \ python ${{ env.GENERATE_PRESIGNED_URLS_SCRIPT_PATH }} \
--process ${{ env.PRESIGNED_URLS_SCRIPT_PROCESS }} \ $SCRIPT_PARAMS
--wazuh-version ${{ env.WAZUH_VERSION }} \
--aws-s3-bucket-dev ${{ env.LOCAL_AWS_S3_BUCKET_DEV }} \
--indexer-revision $INDEXER_REVISION \
--manager-revision $MANAGER_REVISION \
--dashboard-revision $DASHBOARD_REVISION \
--agent-revision $AGENT_REVISION \
--assistant-revision $ASSISTANT_REVISION
- name: Save presigned URLs file to artifact - name: Save presigned URLs file to artifact
if: ${{ inputs.dev == true }} if: ${{ inputs.dev == true }}
CHANGELOG.md
+1
View File
@@ -12,6 +12,7 @@ All notable changes to this project will be documented in this file.
### Changed ### Changed
- Add new path on artifact_urls file ([#2344](https://github.com/wazuh/wazuh-docker/pull/2344)) - Add new path on artifact_urls file ([#2344](https://github.com/wazuh/wazuh-docker/pull/2344))
- Presigned URLs generation enhancement ([#2346](https://github.com/wazuh/wazuh-docker/pull/2346))
- Adapt bumper workflows to change main branch ([#2294](https://github.com/wazuh/wazuh-docker/pull/2294)) - Adapt bumper workflows to change main branch ([#2294](https://github.com/wazuh/wazuh-docker/pull/2294))
- Delete all API user and password references and Wazuh agent references ([#2289](https://github.com/wazuh/wazuh-docker/pull/2289)) - Delete all API user and password references and Wazuh agent references ([#2289](https://github.com/wazuh/wazuh-docker/pull/2289))
- Create certificate directory with default user and group ([#2287](https://github.com/wazuh/wazuh-docker/pull/2287)) - Create certificate directory with default user and group ([#2287](https://github.com/wazuh/wazuh-docker/pull/2287))