yahoo_1999/fk-wazuh
1
0
Fork 0
forked from wazuh/wazuh-docker
Code Pull Requests Activity
2,217 Commits 125 Branches 170 Tags
7371f40bb188bb87bf50cb74995245db8708fd0c
Commit Graph
256 Commits
Author SHA1 Message Date
Gonzalo Acuña 825ddd9db7 Bump to 6.0.0 2025-05-13 14:33:15 -03:00
Jesus Garcia 95c2e34794 Update references of 'master' branch to 'main' 2025-02-11 08:56:58 -05:00
vcerenu 69df531ca9 Resolve conflicts 2024-10-17 13:04:31 -03:00
vcerenu a5c313843e Resolve conflicts 2024-10-17 12:49:32 -03:00
vcerenu 7ca14b9fc8 Resolve conflicts 2024-10-17 12:34:40 -03:00
vcerenu 42977e3131 Resolve conflicts 2024-10-17 12:33:13 -03:00
c-bordon e6c5e82a32 Bumped branch 4.10.2 to 4.10.2 version 2024-10-03 12:11:27 -03:00
JESUS D. GARCIA 8bafe1295b Change the dev default value to true for the workflow_dispatch 2024-10-01 10:06:13 -05:00
JESUS D. GARCIA 027b26047f Update Procedure_push_docker_images.yml 2024-09-30 16:20:31 -05:00
vcerenu 08ba82d16d Bump new Wazuh 4.10.1 version 2024-09-24 12:09:02 -03:00
JESUS D. GARCIA 471aedae5b Update changelog 2024-09-13 12:49:10 -05:00
JESUS D. GARCIA b38b3c7e59 * Update the Procedure push docker images workflow file 
* Handle the build process exit code properly
 2024-09-12 14:43:55 -05:00
Gonzalo Acuña 205983317f Merge pull request #1521 from wazuh/maintenance/5651-merge-4.10.0-into-master 
Maintenance/5651 merge 4.10.0 into master
 2024-09-10 11:36:17 -03:00
JESUS D. GARCIA 570bf081bc Update default values in Procedure_push_docker_images.yml 2024-09-10 09:35:12 -05:00
JESUS D. GARCIA f0253ba984 Add Procedure_push_docker_images.yml workflow file 2024-09-06 19:40:54 -05:00
David Correa Rodríguez d5a60b7264 Merge branch '4.10.0' into merge-4.10.0-into-master 2024-08-21 12:30:00 +02:00
David Correa Rodríguez bbc4529088 Merge branch '4.9.1' into merge-4.9.1-into-4.10.0 2024-08-21 12:10:54 +02:00
David Correa Rodríguez f08c39ed6d Merge branch '4.9.0' into merge-4.9.0-into-4.9.1 2024-08-21 11:45:09 +02:00
vcerenu 2adb0cc46d Fix docker-compose error during test 2024-08-06 08:17:22 -03:00
vcerenu ca6cc555f2 Fix docker-compose error during test 2024-08-05 15:24:11 -03:00
vcerenu eca65a8538 Fix docker-compose error during test 2024-08-05 15:02:52 -03:00
David Correa Rodríguez 125053f6d5 Bump 4.9.1 version 2024-07-23 10:00:08 +02:00
Carlos Bordon 54b2d4ce33 Revert "Revert merges of 4.9.0 branch into master branch" 2024-07-19 10:34:13 -03:00
David Correa Rodríguez 719d4c2b05 Merge branch '4.9.0' into merge-4.9.0-into-4.10.0 2024-07-19 11:32:51 +02:00
David Correa Rodríguez eded59bc25 Revert "Merge branch '4.9.0' into merge-4.9.0-into-master" 
This reverts commit 4923750ea4, reversing
changes made to e1d70c35fe.
 2024-07-19 09:27:46 +02:00
David Correa Rodríguez 4923750ea4 Merge branch '4.9.0' into merge-4.9.0-into-master 2024-07-18 14:48:50 +02:00
vcerenu a275a08cfe Upward merge 2024-07-08 11:54:01 -03:00
vcerenu 6138516ad9 Fix wazuh documents tests 2024-07-04 13:36:55 -03:00
vcerenu 665f6fd84a Fix goss test 2024-07-04 13:01:22 -03:00
vcerenu ed9b2f0d39 change version for goss 2024-06-25 12:21:58 -03:00
vcerenu 8019e386bc Bump 4.10.0 version 2024-06-19 10:20:28 -03:00
vcerenu 36e7160332 Add save and load process for Wazuh Cert Tool image 2024-06-11 10:19:50 -03:00
vcerenu cf3eb61081 Add save and load process for Wazuh Cert Tool image 2024-06-11 10:16:22 -03:00
vcerenu fda4a171f4 Add save and load process for Wazuh Cert Tool image 2024-06-11 10:14:19 -03:00
vcerenu 1e6f93b20a Correct the name of the certificate generator script 2024-06-11 09:46:53 -03:00
Gonzalo Acuña f8b2399347 Bump to 4.8.1 2024-06-04 11:43:03 -03:00
vcerenu 4c74ebfc80 resolving conflicts 2024-04-30 05:39:50 -03:00
David Correa Rodríguez d904595787 Bumped version to 4.7.4 2024-04-18 15:16:32 +02:00
David Correa Rodríguez dc13ef3f72 Merge branch '4.9.0' into merge-4.9.0-into-master 2024-04-01 11:11:14 +02:00
David Correa Rodríguez b13aef91d1 Merge branch '4.8.2' into merge-4.8.2-into-4.9.0 2024-04-01 10:58:25 +02:00
David Correa Rodríguez 4b98b24999 Merge branch '4.8.1' into merge-4.8.1-into-4.8.2 2024-04-01 10:48:42 +02:00
David Correa Rodríguez 97ba114f8e Merge branch '4.8.0' into merge-4.8.0-into-4.8.1 2024-04-01 10:06:22 +02:00
vcerenu cbdc152dda clean disk and change way to wait Cluster start 2024-03-27 14:25:31 -03:00
vcerenu 2e8c7f99b5 fix goss test 2024-02-29 13:03:50 -03:00
vcerenu 5a5fbdd62c bump 4.7.3 version 2024-02-19 06:02:47 -03:00
David Correa Rodríguez d3d2ae7b86 Bump version to 5.0.0 2024-02-13 10:32:58 +01:00
David Correa Rodríguez 0567dd1632 Merge branch '4.8.2' into merge-4.8.2-into-master 2024-01-10 18:04:39 +01:00
David Correa Rodríguez 41b25fe60f Merge branch '4.8.1' into merge-4.8.1-into-4.8.2 2024-01-10 18:01:07 +01:00
David Correa Rodríguez 284b945cd8 Merge branch '4.8.1' into merge-4.8.1-into-master 2024-01-10 17:51:03 +01:00
c-bordon caddf2893a Testing with sleep 2024-01-04 13:02:39 -03:00