diff --git a/.github/workflows/Procedure_push_docker_images.yml b/.github/workflows/Procedure_push_docker_images.yml index 28e9e104..9402ec82 100644 --- a/.github/workflows/Procedure_push_docker_images.yml +++ b/.github/workflows/Procedure_push_docker_images.yml @@ -233,6 +233,11 @@ jobs: source ${{ env.WORKFLOW_VENV }}/bin/activate WAZUH_COMPONENTS='${{ needs.setup.outputs.WAZUH_COMPONENTS }}' 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 COMPONENTS=($(echo "$WAZUH_COMPONENTS" | jq -r '.[]')) @@ -251,29 +256,22 @@ jobs: for i in "${!COMPONENTS[@]}"; do case "${COMPONENTS[$i]}" in wazuh-manager) - MANAGER_REVISION="${REVISIONS[$i]}" + SCRIPT_PARAMS+="--manager-revision ${REVISIONS[$i]} " ;; wazuh-dashboard) - DASHBOARD_REVISION="${REVISIONS[$i]}" + SCRIPT_PARAMS+="--dashboard-revision ${REVISIONS[$i]} " ;; wazuh-indexer) - INDEXER_REVISION="${REVISIONS[$i]}" + SCRIPT_PARAMS+="--indexer-revision ${REVISIONS[$i]} " ;; wazuh-agent) - AGENT_REVISION="${REVISIONS[$i]}" + SCRIPT_PARAMS+="--agent-revision ${REVISIONS[$i]} " ;; esac done python ${{ env.GENERATE_PRESIGNED_URLS_SCRIPT_PATH }} \ - --process ${{ env.PRESIGNED_URLS_SCRIPT_PROCESS }} \ - --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 + $SCRIPT_PARAMS - name: Save presigned URLs file to artifact if: ${{ inputs.dev == true }} diff --git a/CHANGELOG.md b/CHANGELOG.md index 6aaab249..f30c324e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,7 @@ All notable changes to this project will be documented in this file. ### Changed - 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)) - 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))