-
Notifications
You must be signed in to change notification settings - Fork 197
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Add environments for 4.5 #5797
Add environments for 4.5 #5797
Conversation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
CR: 🟢
Tests
It is necessary to have a version of docker compose equal to or greater than v2.20.2, since in that version support for depends_on.require
is added.
Used Docker Compose version v2.20.3
osd-dev: 🟢
- WITHOUT SAML
- WITH SAML
wazuh-4.5-wz 🟢
prerelease environment
release environment
- WITHOUT SAML
- WITH SAML
The base branch was changed.
46eaf9d
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM.
This pull request was approved previously by some co-workers. I made some request changes that dismissed the approbation.
* Add environments for 4.5 * Add saml required: false * Fix readme * Fix readme 4.4 * Update README.md * Update README.md (cherry picked from commit 622f346)
The backport to
To backport manually, run these commands in your terminal: # Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-4.5.2-7.10 4.5.2-7.10
# Navigate to the new working tree
cd .worktrees/backport-4.5.2-7.10
# Create a new branch
git switch --create backport-5797-to-4.5.2-7.10
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 622f346ecbfdec2edd43326cdfd9bc01ec0cccd7
# Push it to GitHub
git push --set-upstream origin backport-5797-to-4.5.2-7.10
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-4.5.2-7.10 Then, create a pull request where the |
* Add environments for 4.5 * Add saml required: false * Fix readme * Fix readme 4.4 * Update README.md * Update README.md (cherry picked from commit 622f346)
* Bump revision to 02 (4.5.2) (#5844) bump: revision to 02 * Add environments for 4.5 (#5797) * Add environments for 4.5 * Add saml required: false * Fix readme * Fix readme 4.4 * Update README.md * Update README.md --------- Co-authored-by: Ian Yenien Serrano <63758389+yenienserrano@users.noreply.github.com>
* [Backport 4.5.2-7.10] Bump revision to 02 (4.5.2) (#5847) Bump revision to 02 (4.5.2) (#5844) bump: revision to 02 (cherry picked from commit 2664730) * [Backport 4.5.2-7.10]Add environments for 4.5 (#5797) (#5851) Add environments for 4.5 (#5797) * Add environments for 4.5 * Add saml required: false * Fix readme * Fix readme 4.4 * Update README.md * Update README.md (cherry picked from commit 622f346) --------- Co-authored-by: Antonio <34042064+Desvelao@users.noreply.github.com>
* [Backport 4.5.2-7.16] Bump revision to 02 (4.5.2) (#5846) Bump revision to 02 (4.5.2) (#5844) bump: revision to 02 (cherry picked from commit 2664730) * [Backport 4.5.2-7.16] Add environments for 4.5 (#5850) Add environments for 4.5 (#5797) * Add environments for 4.5 * Add saml required: false * Fix readme * Fix readme 4.4 * Update README.md * Update README.md (cherry picked from commit 622f346) Co-authored-by: Ian Yenien Serrano <63758389+yenienserrano@users.noreply.github.com> --------- Co-authored-by: Antonio <34042064+Desvelao@users.noreply.github.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
* Bump 4.5.3 (#5824) * Merge 4.5.2 into 4.5.3 (#5856) * Bump revision to 02 (4.5.2) (#5844) bump: revision to 02 * Add environments for 4.5 (#5797) * Add environments for 4.5 * Add saml required: false * Fix readme * Fix readme 4.4 * Update README.md * Update README.md --------- Co-authored-by: Ian Yenien Serrano <63758389+yenienserrano@users.noreply.github.com> --------- Co-authored-by: Federico Rodriguez <federico.rodriguez@wazuh.com> Co-authored-by: Ian Yenien Serrano <63758389+yenienserrano@users.noreply.github.com>
Description
Add environments for 4.5
To work, you need docker compose version 2.20.2
docker/compose#10804
https://github.com/docker/compose/releases/tag/v2.20.2