paulmataruso/wazuh-docker-orginal
1
0
Fork 0
mirror of https://github.com/wazuh/wazuh-docker.git synced 2025-10-23 06:11:57 +00:00
Code Issues Packages Projects Releases Wiki Activity
2,584 Commits 92 Branches 159 Tags
main
Commit Graph

2584 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Gonzalo Acuña
a136444ee9 Merge pull request #1974 from wazuh/merge-4.14.1-into-main 
Merge 4.14.1 into main
 2025-08-14 09:03:55 -03:00
vcerenu
0989e11d43 Resolving conflicts 2025-08-14 09:00:41 -03:00
vcerenu
6c87ecf7f0 Resolving conflicts 2025-08-14 08:56:57 -03:00
Carlos Anguita
555a0e2590 Merge pull request #1973 from wazuh/merge-4.14.0-into-4.14.1 2025-08-14 13:29:36 +02:00
vcerenu
54fe999414 Merge branch '4.14.1' of github.com:wazuh/wazuh-docker into 4.14.0 2025-08-14 08:22:00 -03:00
Carlos Anguita
c027b3efba Merge pull request #1972 from wazuh/merge-4.13.0-into-4.14.0 2025-08-14 13:16:47 +02:00
vcerenu
7bc871bde9 Resolving conflicts 2025-08-14 08:09:22 -03:00
Gonzalo Acuña
43d8f2b29d Merge pull request #1968 from wazuh/bug/1966-permanent-data-excp-4.13.0 
Add wazuh-template.json into permanent data exception
 2025-08-13 11:10:46 -03:00
Gonzalo Acuña
bc4d15d1c2 Merge pull request #1953 from wazuh/bug/2511-delete-dockerfile-line 
Double the amount of space consumed in Wazuh Indexer
 2025-08-13 10:18:06 -03:00
vcerenu
ee599583eb Add changelog 2025-08-13 08:49:50 -03:00
vcerenu
14caf8058d Add wazuh-template.json into permanent data exception 2025-08-13 08:29:40 -03:00
Gonzalo Acuña
b86ea0d6bc Merge pull request #1958 from wazuh/enhancement/1956-revert-changes 
Revert rc4 changes
 2025-08-07 09:08:50 -03:00
Gonzalo Acuña
d122b702f1 Revert rc4 changes 2025-08-07 08:56:44 -03:00
Gonzalo Acuña
fde6c509d7 Merge pull request #1957 from wazuh/merge-4.13.0-into-4.13.1 
Merge 4.13.0 into 4.13.1
 2025-08-07 08:41:02 -03:00
vcerenu
fb5b4488de Revert version 2025-08-07 08:38:27 -03:00
vcerenu
8d0f306801 Resolving conflicts 2025-08-07 08:13:22 -03:00
vcerenu
831d759cd9 Bump rc4 stage 2025-08-07 08:09:01 -03:00
vcerenu
2811883877 Bump rc4 stage 2025-08-07 08:06:41 -03:00
vcerenu
82a967c0df Add changelog 2025-08-05 13:37:39 -03:00
vcerenu
29190cce99 Delete Dcokerfile line 2025-08-05 12:50:34 -03:00
Gonzalo Acuña
beef440c3a Merge pull request #1951 from wazuh/bug/2511-security-plugin-perm-errors 
Fix config directory for opensearch_security plugin work
 2025-08-04 13:49:52 -03:00
vcerenu
3243306b07 Add docker-compose multi node config 2025-08-04 13:18:59 -03:00
vcerenu
81208b9abe rollback certs path 2025-08-01 14:05:37 -03:00
vcerenu
f53f1930aa Add changelog 2025-08-01 13:11:48 -03:00
vcerenu
85709013bc Fix config directory for opensearch_security plugin work 2025-08-01 12:44:43 -03:00
Carlos Anguita
c94263eacd Merge pull request #1950 from wazuh/enhancement/1948-revert-image-tag-for-4.13.0rc3 2025-07-30 10:44:54 +02:00
Enrique Araque
5d5fe18d82 Revert image tag for 4.13.0-rc3 2025-07-30 10:42:50 +02:00
Wazuh CI
339500631d Merge pull request #1949 from wazuh/enhancement/wqa3042-bump-4.13.0 
Bump 4.13.0 branch
 2025-07-30 09:42:36 +02:00
wazuhci
1057715f3d feat: bump 4.13.0 2025-07-30 07:42:30 +00:00
Wazuh CI
6f94d5aa65 Merge pull request #1947 from wazuh/enhancement/wqa3035-bump-4.14.1 
Bump 4.14.1 branch
 2025-07-29 18:11:15 +02:00
wazuhci
846ae52263 feat: bump 4.14.1 2025-07-29 16:11:09 +00:00
Gonzalo Acuña
c129cd9835 Merge pull request #1945 from wazuh/merge-4.14.0-into-main 
Merge 4.14.0 into main
 2025-07-25 10:11:45 -03:00
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
Gonzalo Acuña
76e3c62b9a Merge pull request #1944 from wazuh/merge-4.13.1-into-4.14.0 
Merge 4.13.1 into 4.14.0
 2025-07-25 09:58:41 -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
Gonzalo Acuña
0222bcc9f8 Merge pull request #1943 from wazuh/merge-4.13.0-into-4.13.1 
Merge 4.13.0 into 4.13.1
 2025-07-25 09:48:04 -03:00
vcerenu
23e8982c45 Fix dev stage example 2025-07-25 09:44:43 -03:00
vcerenu
cb6c3de364 Fix dev stage example 2025-07-25 09:43:41 -03:00
vcerenu
89184e77ab Resolving conflicts 2025-07-25 09:27:03 -03:00
vcerenu
191ef58a9b Resolving conflicts 2025-07-25 09:22:48 -03:00
Carlos Bordon
ac7121e411 Merge pull request #1938 from wazuh/enhancement/1936-revert-image-tag 
Revert rc2 stage into 4.13.0 branch
 2025-07-18 10:15:52 -03:00
vcerenu
1146acb3a4 Revert rc2 stage into 4.13.0 branch 2025-07-18 10:03:11 -03:00
Wazuh CI
a8582fdd4b Merge pull request #1937 from wazuh/enhancement/wqa2817-bump-4.13.0 
Bump 4.13.0 branch
 2025-07-18 10:04:11 +02:00
wazuhci
7a13fa72b3 feat: bump 4.13.0 2025-07-18 08:04:06 +00:00
Carlos Anguita
dc74728c42 Merge pull request #1932 from wazuh/enhancement/1930-revert-image-tag-for-4.13.0rc1 2025-07-14 09:58:27 +02:00
Enrique Araque
7fdcb0a320 Change docker image tag for 4.13.0-rc1 2025-07-14 09:50:19 +02:00
Wazuh CI
5c99764d2c Merge pull request #1931 from wazuh/enhancement/wqa2745-bump-4.13.0 
Bump 4.13.0 branch
 2025-07-14 09:20:03 +02:00
wazuhci
28f7be1f7d feat: bump 4.13.0 2025-07-14 07:19:55 +00:00
Gonzalo Acuña
2d2d3ec7ca Merge pull request #1928 from wazuh/bug/1924-add-copy-indexer-files 
Update Dockerfile to copy `opensearch-security` files
 2025-07-11 12:55:26 -03:00
fcaffieri
9cc135d05b Update CHANGELOG 2025-07-08 17:30:26 -03:00