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

Merge pull request #2291 from wazuh/change/3084-main-update-workflow-action-versions

Browse Source 
Merge 4.14.5 into main
This commit is contained in:
Carlos Bordon
2026-04-08 09:28:01 -03:00
committed by GitHub
parent 9de7fdc034 9d87298016
commit 70d0a55f46
4 changed files with 9 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/workflows/4_bumper_repository.yml
+1 -1
View File
@@ -70,7 +70,7 @@ jobs:
export GPG_TTY=$(tty) export GPG_TTY=$(tty)
- name: Checkout repository - name: Checkout repository
uses: actions/checkout@v4 uses: actions/checkout@v6
with: with:
# Using workflow-specific GITHUB_TOKEN because currently CI_WAZUHCI_BUMPER_TOKEN # Using workflow-specific GITHUB_TOKEN because currently CI_WAZUHCI_BUMPER_TOKEN
# doesn't have all the necessary permissions # doesn't have all the necessary permissions
.github/workflows/Procedure_push_docker_images.yml
+5 -5
View File
@@ -302,19 +302,19 @@ jobs:
steps: steps:
- name: Checkout repository - name: Checkout repository
uses: actions/checkout@v4 uses: actions/checkout@v6
with: with:
ref: ${{ inputs.docker_reference }} ref: ${{ inputs.docker_reference }}
- name: Set up QEMU - name: Set up QEMU
uses: docker/setup-qemu-action@v3 uses: docker/setup-qemu-action@v4
- name: Set up Docker Buildx - name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3 uses: docker/setup-buildx-action@v4
- name: Configure aws credentials - name: Configure aws credentials
if: ${{ inputs.dev == true }} if: ${{ inputs.dev == true }}
uses: aws-actions/configure-aws-credentials@v4 uses: aws-actions/configure-aws-credentials@v6
with: with:
role-to-assume: ${{ secrets.AWS_IAM_DOCKER_ROLE }} role-to-assume: ${{ secrets.AWS_IAM_DOCKER_ROLE }}
aws-region: "${{ secrets.AWS_REGION }}" aws-region: "${{ secrets.AWS_REGION }}"
@@ -325,7 +325,7 @@ jobs:
- name: Log in to Docker Hub - name: Log in to Docker Hub
if: ${{ inputs.dev == false }} if: ${{ inputs.dev == false }}
uses: docker/login-action@v3 uses: docker/login-action@v4
with: with:
username: ${{ secrets.DOCKERHUB_USERNAME }} username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_PASSWORD }} password: ${{ secrets.DOCKERHUB_PASSWORD }}
CHANGELOG.md
+3 -2
View File
@@ -62,11 +62,12 @@ All notable changes to this project will be documented in this file.
### Changed ### Changed
- None - Updated GitHub actions version for wazuh-docker workflows. ([#2290](https://github.com/wazuh/wazuh-docker/pull/2290))
### Fixed ### Fixed
- None - Fix WAZUH_AGENT_GROUP variable ([#2262](https://github.com/wazuh/wazuh-docker/pull/2262))
- Fix bumper script early exit ([#2261](https://github.com/wazuh/wazuh-docker/pull/2261))
### Deleted ### Deleted
tools/repository_bumper.sh
-5
View File
@@ -146,11 +146,6 @@ main() {
# Get old version and stage # Get old version and stage
get_old_version_and_stage get_old_version_and_stage
if [[ "${OLD_VERSION}" == "${VERSION}" && "${OLD_STAGE}" == "${STAGE}" ]]; then
echo "Version and stage are already up to date." | tee -a "${LOG_FILE}"
echo "No changes needed." | tee -a "${LOG_FILE}"
exit 0
fi
if [[ "${OLD_VERSION}" != "${VERSION}" ]]; then if [[ "${OLD_VERSION}" != "${VERSION}" ]]; then
echo "Updating version from ${OLD_VERSION} to ${VERSION}" | tee -a "${LOG_FILE}" echo "Updating version from ${OLD_VERSION} to ${VERSION}" | tee -a "${LOG_FILE}"
update_version_in_files "${VERSION}" update_version_in_files "${VERSION}"