Commit Graph
314 Commits
Author SHA1 Message Date
vcerenu 5be199b9df Delete service tag and modifiy docker-compose execution for a new version 2024-12-02 10:30:09 -03: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 42977e3131 Resolve conflicts 2024-10-17 12:33:13 -03:00
vcerenu 691694a38d Resolve conflicts 2024-10-17 12:22:38 -03:00
vcerenu 1aa149933b Fix typos 2024-10-10 11:09:09 -03:00
vcerenu 8695a087d5 Resolving merge conflicts 2024-10-10 08:05:07 -03:00
c-bordon e6c5e82a32 Bumped branch 4.10.2 to 4.10.2 version 2024-10-03 12:11:27 -03:00
Enrique Araque 92d0582201 Revert create_user.py script deletion 2024-10-03 13:18:25 +02:00
vcerenu 08ba82d16d Bump new Wazuh 4.10.1 version 2024-09-24 12:09:02 -03:00
David Correa Rodríguez 301ea9e21a Merge branch '4.8.2' into merge-4.8.2-into-4.9.0 2024-09-23 10:20:48 +02: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
vcerenu 8e7b2cd390 Add delete of wazuh yum repo 2024-09-05 15:19:32 -03:00
vcerenu 73fffcf52d Modify check repository for image builder 2024-09-05 13:12:47 -03: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 6eb435a82f Add Azure wodle files to persistence excepction 2024-08-06 09:37:47 -03:00
vcerenu a063b27592 Fix Wazuh indexer and manager build error 2024-08-05 14:14:28 -03:00
vcerenu bc2a446c17 Fix Wazuh indexer and manager build error 2024-08-05 12:13:20 -03:00
David Correa Rodríguez 125053f6d5 Bump 4.9.1 version 2024-07-23 10:00:08 +02:00
vcerenu 2ee7cfa515 Add eazuh.yml file in the Wazuh dashboard image build process 2024-07-19 12:25:09 -03:00
David Correa Rodríguez 1a1bc2d72b Merge branch 'master' into merge-4.10.0-into-master 2024-07-19 15:38:49 +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 096f0abb32 Merge branch '4.10.0' into merge-4.10.0-into-master 2024-07-19 13:19:41 +02: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
David Correa Rodríguez 0a440c0433 Removed whitespaces 2024-07-18 14:34:12 +02:00
David Correa Rodríguez 311ffc72d8 Merge branch '4.8.1' into merge-4.8.1-into-4.9.0 2024-07-18 14:28:33 +02:00
Victor Ereñú b60e875962 Revert "Add new keystore certificate" 2024-07-11 23:01:18 +10:00
vcerenu a275a08cfe Upward merge 2024-07-08 11:54:01 -03:00
Carlos Anguita López 9c36a8a13b Removed references to modules because they are now enabled by default 2024-07-04 12:53:33 +02:00
vcerenu 2487a5481e Add new keystore generation 2024-07-02 15:01:37 -03:00
vcerenu 24f12a72d7 Modify Wazuh indexer and dashboard Dockerfles 2024-06-25 09:33:41 -03:00
vcerenu 8019e386bc Bump 4.10.0 version 2024-06-19 10:20:28 -03:00
vcerenu 450a59a7c8 Change the name dir to Wazuh cert tool Dockerfile 2024-06-10 07:11:20 -03:00
vcerenu fc1ece705e Add the build of Wazuh cert tool image to build image process 2024-06-07 05:44:14 -03:00
Gonzalo Acuña f8b2399347 Bump to 4.8.1 2024-06-04 11:43:03 -03:00
Gonzalo Acuña 937b5fad87 Merge pull request #1312 from wazuh/461-conf-files-environment
Add environment for configure wazuh indexer and dashboard files
2024-05-17 09:36:41 -03:00
Gonzalo Acuña 3d7c673671 Merge pull request #1327 from wazuh/merge-4.9.0-into-master
Merge 4.9.0 into master
2024-04-30 08:21:30 -03:00
vcerenu 390a71ebea resolving conflicts 2024-04-30 07:03:06 -03:00
vcerenu 10f278cadb add environment variables for configure wazuh indexer and dashboard files 2024-04-23 11:43:29 -03:00
Carlos Anguita López 92d6f87091 Changed Docker base image ocurrences from amazonlinux:2023.3.20240304.0 to amazonlinux:2023 2024-04-10 13:18:01 +02:00
Carlos Anguita López f4ccd4b0a6 Removed commented lines 87 to 91 2024-04-09 09:26:47 +02:00
David Correa Rodríguez f685bfaa9d Merge branch 'master' into merge-4.9.0-into-master 2024-04-01 11:26:05 +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