yahoo_1999/fk-wazuh
1
0
Fork 0
forked from wazuh/wazuh-docker
Code Pull Requests Activity
1,645 Commits 125 Branches 170 Tags
cda712949a0c78d06b968c73ddd40ce019fda361
Commit Graph
1645 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
vcerenu cda712949a add mounted directories into dockerfile 2023-10-25 09:20:33 -03:00
vcerenu 4a95d18b9a add mounted directories into dockerfile 2023-10-25 06:29:09 -03:00
David Correa Rodríguez bfae09af52 Merge pull request #1081 from wazuh/merge-4.7.0-into-4.7.1 
Merge 4.7.0 into 4.7.1
 2023-10-24 09:53:02 +02:00
David Correa Rodríguez 1c0b12deaa Merge branch '4.7.0' into merge-4.7.0-into-4.7.1 2023-10-24 09:48:38 +02:00
David Correa Rodríguez 92b3395abc Merge pull request #1080 from wazuh/merge-4.6.0-into-4.7.0 
Merge 4.6.0 into 4.7.0
 2023-10-24 09:47:17 +02:00
David Correa Rodríguez b1d10f879c Merge branch '4.6.0' into merge-4.6.0-into-4.7.0 2023-10-24 09:42:48 +02:00
David Correa Rodríguez 98e96a5260 Merge pull request #1077 from wazuh/merge-4.5.4-into-4.6.0 
Merge 4.5.4 into 4.6.0
v4.6.0 		2023-10-24 09:40:50 +02:00
David Correa Rodríguez 84e57b9c9a Merge branch '4.5.4' into merge-4.5.4-into-4.6.0 2023-10-24 09:25:31 +02:00
Victor Ereñú e13cfcf454 Merge pull request #1073 from wazuh/bump-revision-4.6.0 
Bump revision 40603
 2023-10-23 12:33:32 -03:00
vcerenu e48255641f bump revision 2023-10-23 12:21:49 -03:00
Victor Ereñú c4d6a254cc Merge pull request #1067 from wazuh/merge-4.7.0-into-4.7.1 
Merge 4.7.0 into 4.7.1
 2023-10-23 05:37:06 -03:00
vcerenu d45e2d984e resolving conflicts 2023-10-23 05:27:21 -03:00
vcerenu 781e6a4082 resolving conflicts 2023-10-23 05:25:42 -03:00
Victor Ereñú 0c7d298eea Merge pull request #1066 from wazuh/merge-4.6.0-into-4.7.0 
Merge 4.6.0 into 4.7.0
 2023-10-23 05:21:47 -03:00
Victor Ereñú 05ef9b899b Merge pull request #1065 from wazuh/merge-4.5.4-into-4.6.0 
Bump 4.5.4 version
 2023-10-23 05:14:00 -03:00
vcerenu c46b1c0d82 resolving conflicts 2023-10-23 05:02:02 -03:00
David Correa Rodríguez 3a3218f0d4 Merge pull request #1061 from wazuh/bump-revision-40510 
Bump revision to 40510
v4.5.4 		2023-10-19 12:00:04 +02:00
David Correa Rodríguez dd86d1b707 Bump revision to 40510 2023-10-19 11:46:24 +02:00
Gonzalo Acuña 60563720f3 Merge pull request #1059 from wazuh/bug/1054-remove-filebeat-template-value 
Removed value of Filebeat template variable
 2023-10-17 11:05:17 -03:00
David Correa Rodríguez 0cd98767c8 Removed value of Filebeat template variable 2023-10-17 15:23:37 +02:00
Gonzalo Acuña 8aad8651d7 Merge pull request #1058 from wazuh/bump-version-4.5.4 
Bump 4.5.4 version
 2023-10-17 09:03:27 -03:00
vcerenu 3c073ab5ea bump 4.5.4 version 2023-10-17 09:01:18 -03:00
Gonzalo Acuña b8ff013b36 Merge pull request #1056 from wazuh/bug/1054-the-images-build-fails-due-to-filebeat-template-branch 
Fixed Filebeat template bug in image generation
 2023-10-17 08:33:09 -03:00
vcerenu 5106715b0c bump 4.5.4 version 2023-10-17 05:55:15 -03:00
David Correa Rodríguez 523a28b20d Fixed Filebeat template bug in image generation 2023-10-16 16:09:05 +02:00
David Correa Rodríguez 0f1cc4b955 Merge pull request #1053 from wazuh/bump-revision-40701 
Bump revision to 40701
 2023-10-13 11:42:21 +02:00
David Correa Rodríguez aee83a1a2d Bump revision to 40701 2023-10-13 10:25:38 +02:00
Victor Ereñú aa88dad36a Merge pull request #1038 from wazuh/merge-4.7.0-into-4.7.1 
Merge 4.7.0 into 4.7.1
 2023-10-09 06:37:00 -03:00
vcerenu a424c683ae bump new builder script 2023-10-09 06:34:35 -03:00
Victor Ereñú 0555e4956b Merge pull request #1037 from wazuh/bump-4.7.0 
Bump new builder script
 2023-10-09 06:31:28 -03:00
vcerenu dee2c3c8dc bump new builder script 2023-10-09 06:28:03 -03:00
Victor Ereñú 1e29e8fcfc Merge pull request #1035 from wazuh/merge-4.7.0-into-4.7.1 
Merge 4.7.0 into 4.7.1
 2023-10-09 06:04:29 -03:00
David Correa Rodríguez 25be906860 Merge branch '4.7.0' into merge-4.7.0-into-4.7.1 2023-10-09 10:50:11 +02:00
Victor Ereñú c18a1eca56 Merge pull request #1034 from wazuh/merge-4.6.0-into-4.7.0 
Merge 4.6.0 into 4.7.0
 2023-10-09 05:33:57 -03:00
David Correa Rodríguez 14dcc8b6a6 Merge 4.6.0 into 4.7.0 2023-10-09 09:41:25 +02:00
Gonzalo Acuña 89e0fc9604 Merge pull request #1033 from wazuh/bump-revision-4.6.0 
Bump revision to 40602
 2023-10-06 09:15:14 -03:00
David Correa Rodríguez 64f083631d Bump revision to 40602 2023-10-06 14:11:05 +02:00
David Correa Rodríguez fa2f2b2a31 Merge pull request #1031 from wazuh/merge-4.5.3-into-4.6.0 
Merge 4.5.3 into 4.6.0
 2023-10-06 10:48:10 +02:00
David Correa Rodríguez 8d1c239a3c Merge branch '4.5.3' into merge-4.5.3-into-4.6.0 2023-10-06 10:23:04 +02:00
Gonzalo Acuña ded91b2f0a Merge pull request #1029 from wazuh/bump-4.5.3-revision 
Bump 4.5.3 revision
v4.5.3 		2023-10-05 11:48:22 -03:00
Gonzalo Acuña d7e051af19 Bump 4.5.3 revision 2023-10-05 11:44:40 -03:00
Gonzalo Acuña b4db7f16cc Merge pull request #1026 from wazuh/bug/change-validation-order-for-wazuh-branch-to4.6.0 
Changed validation order for wazuh branch
 2023-10-04 15:42:36 -03:00
c-bordon 61bfe58491 Changed validation order for wazuh branch 2023-10-04 15:38:39 -03:00
Gonzalo Acuña 9d3701fa60 Merge pull request #1025 from wazuh/enhancement/1016-allow-branch-parameters-on-build-imagessh-to4.6.0 
Updated build-images.sh script to support build parameters
 2023-10-04 13:49:42 -03:00
c-bordon c550c1a852 Added validation for version in master branch 2023-10-04 12:29:15 -03:00
c-bordon 1b41068618 Updated README file 2023-10-04 11:55:39 -03:00
c-bordon 8ac3ea1e8a Added final space 2023-10-04 11:44:00 -03:00
c-bordon 893796c4a2 Restore .env file 2023-10-04 11:41:22 -03:00
Gonzalo Acuña d6a72c6fb1 Merge pull request #1024 from wazuh/bug/1017-warning-opensearchsecurityplugin-wazuh-indexer-has-insecure-file-permissions-should-be-0600-to4.6.0 
Updated file permissions to have the same permissions as in package installation in Wazuh indexer
 2023-10-04 11:22:44 -03:00
c-bordon 7172c818c7 Update order of variables 2023-10-04 11:16:04 -03:00