292 Commits

Author SHA1 Message Date
vcerenu
a1afcd2c40 Merge branch 'main' of github.com:wazuh/wazuh-docker into merge-4.14.0-into-main 2025-07-25 10:00:39 -03:00
vcerenu
5a1daaf4ce Merge branch '4.14.0' of github.com:wazuh/wazuh-docker into merge-4.13.1-into-4.14.0 2025-07-25 09:54:44 -03:00
vcerenu
191ef58a9b Resolving conflicts 2025-07-25 09:22:48 -03:00
vcerenu
5bbce9e403 Change docker-compose references 2025-07-04 12:43:41 -03:00
Gonzalo Acuña
6bac41a05d Merge pull request #1895 from wazuh/enhancement/1892-bumper-main
Bumper propagation to main
2025-06-19 11:44:56 -03:00
Gonzalo Acuña
1bfc4ff4c2 Merge pull request #1894 from wazuh/enhancement/1892-bumper-4.14.0
Bumper propagation to 4.14.0
2025-06-19 11:42:05 -03:00
Gonzalo Acuña
f5473f0004 Merge pull request #1893 from wazuh/enhancement/1892-bumper
Enhancement/1892 bumper
2025-06-19 11:35:49 -03:00
Raul Del Pozo Moreno
056300b59d fix: added admin privilege to PR merge 2025-06-13 15:38:46 +02:00
Carlos Anguita López
f57f0b33f2 Merge branch '4.14.0' into merge-4.14.0-into-main 2025-06-13 14:59:48 +02:00
Carlos Anguita López
b374f4ba2e merge 4.13.1 into 4.14.0 2025-06-13 14:52:26 +02:00
vcerenu
fb4a062f5a Bump 4.13.1 version 2025-06-13 08:26:34 -03:00
Raul Del Pozo Moreno
8e9390d2e9 chore: abstracted version 2025-06-10 12:28:04 +02:00
Raul Del Pozo Moreno
5604b488c5 fix: fixed env secret 2025-06-10 11:43:13 +02:00
c-bordon
513cbda314 Updated PR message in log 2025-06-09 10:25:53 -03:00
c-bordon
75753a9714 Updated GH token 2025-06-09 10:18:44 -03:00
c-bordon
b2f46deb7d Updated repository branch name 2025-06-05 16:41:55 -03:00
c-bordon
61dfe53a08 Added tag argument for bumper script 2025-06-05 16:31:42 -03:00
c-bordon
0177c4ab98 Removed push 2025-06-05 10:10:14 -03:00
c-bordon
07ccedacec Updated bumped workflow 2025-06-05 10:09:16 -03:00
vcerenu
c6327ac7a2 Resolving conflicts 2025-05-27 15:30:26 -03:00
Gonzalo Acuña
3593e5ed8c Merge pull request #1844 from wazuh/merge-4.13.0-into-4.14.0
Merge 4.13.0 into 4.14.0
2025-05-27 15:22:18 -03:00
vcerenu
3b88bd9852 Resolving conflicts 2025-05-27 14:09:31 -03:00
vcerenu
54cbbf1485 Add docker compose v2 compatibility 2025-05-21 09:09:47 -03:00
vcerenu
90cc26f037 Modify FILEBEAT_STATUS test 2025-05-20 14:52:12 -03:00
vcerenu
a1514129ff Change filebeat output test for multi node test 2025-05-20 14:36:55 -03:00
vcerenu
91a2566aa2 Change grep filter 2025-05-20 14:22:44 -03:00
vcerenu
3cdebd4275 Change filebeat output test for single node test 2025-05-20 10:15:24 -03:00
Jesus Garcia
393956be6a Bump from 4.13.0 to 4.14.0 2025-05-19 12:37:09 -05:00
vcerenu
74c34e87b1 Migrate to Docker Compose v2 2025-05-16 09:25:36 -03:00
vcerenu
02de528417 Bump 5.0.0 version 2025-05-13 14:54:48 -03:00
Gonzalo Acuña
f31a80c579 Merge branch '4.12.2' into enhancement/1794-add-wazuh-agent-test-and-push 2025-05-12 14:04:02 -03:00
vcerenu
208f4231f8 Fix multi node log check 2025-05-09 16:13:00 -03:00
vcerenu
6f42f2a9f7 Add newline in the last line 2025-05-09 16:06:13 -03:00
vcerenu
d291527768 Add Wazuh agent test and push option 2025-05-09 16:02:57 -03:00
vcerenu
81a41f93ed Bump 4.12.2 version 2025-05-06 13:56:32 -03:00
Jesus Garcia
a371c28a05 Bump to 4.12.1 2025-04-09 10:24:24 -05:00
Jesus Garcia
51d3d7a946 Remove default docker reference version from workflow 2025-03-25 16:21:59 -05:00
Jesus Garcia
c1565a5553 Remove 'stable' branch ocurrencies 2025-03-18 11:16:52 -05:00
vcerenu
b2de3600ce Bump 4.13.0 version 2025-03-10 13:44:19 -03:00
vcerenu
6e432a133d Resolving merge conflicts 2025-02-04 09:31:51 -03:00
vcerenu
bc6ab77773 Resolving merge conflicts 2025-02-04 08:57:45 -03:00
Enrique Araque
77ef56ada7 Update 4.11.0 version to 4.12.0 2025-01-10 11:53:10 +01:00
Enrique Araque
081436be42 Merge 4.11.0 into 4.12.0 2025-01-10 11:50:32 +01:00
Enrique Araque
79ead0cf55 Merge 4.10.1 into 4.11.0 2025-01-10 11:29:23 +01:00
vcerenu
9e6defa9d1 Change the cleaning disk step 2024-12-23 08:06:55 -03:00
vcerenu
91295a4b39 Change Ubuntu version used in workflows 2024-12-20 13:13:02 -03:00
vcerenu
39768a397a Bump 4.12.0 version 2024-12-20 10:45:08 -03:00
vcerenu
66a1533425 Bump 4.11.0 version 2024-12-20 10:40:22 -03:00
vcerenu
2c2388ce4a Bump 4.10.1 version 2024-12-20 10:14:29 -03:00
vcerenu
ff54368593 Bump new version 2024-12-18 13:58:58 -03:00