Compare commits

...

134 Commits

Author SHA1 Message Date
Gonzalo Acuña
15e49f7325 Merge pull request #1964 from wazuh/revert-tag-4.10.3-rc1
Revert Tags rc1
2025-08-11 11:53:30 -03:00
vcerenu
96d60d4a49 Revert Tags 2025-08-11 11:51:23 -03:00
Gonzalo Acuña
1c7bb4a60b Merge pull request #1963 from wazuh/enhancement/1962-add-perm-data
Add PERMANENT_DATA exception and bump rc1 stage
2025-08-11 11:46:44 -03:00
vcerenu
090b64b959 Add PERMANENT_DATA exception and bump rc1 stage 2025-08-11 11:44:08 -03:00
Gonzalo Acuña
d3afec63e0 Merge pull request #1961 from wazuh/enhancement/1959-revert-tag
Revert tag
2025-08-08 10:19:43 -03:00
vcerenu
f4933cdfe8 Revert tag 2025-08-08 10:09:44 -03:00
Gonzalo Acuña
c10113ba56 Merge pull request #1960 from wazuh/enhancement/1959-bump-rc1
Bump Revision number and stage
2025-08-08 10:01:29 -03:00
vcerenu
3e1a5a38ae Bump Revision number and stage 2025-08-08 09:53:09 -03:00
Carlos Bordon
440242181a Merge pull request #1839 from wazuh/bump/1838-support-4.10.3-version
Bump to 4.10.3
2025-05-23 13:53:24 -03:00
Jesus Garcia
6673d76a09 Bump to 4.10.3 2025-05-23 11:05:57 -05:00
Gonzalo Acuña
083b7b6571 Merge pull request #1837 from wazuh/bug/2435-docker-4102-packages-failed-to-be-published
Updated docker/login-action module
2025-05-22 15:10:18 -03:00
c-bordon
1c9e8b2c01 Updated changelog 2025-05-22 15:09:43 -03:00
c-bordon
a59789e29a Updated docker/login-action module 2025-05-22 15:07:22 -03:00
Gonzalo Acuña
13090a5446 Merge pull request #1833 from wazuh/revert-1807-enhancement/1792-add-wazuh-image
Revert 1807 PR enhancement/1792 add wazuh image
2025-05-20 11:56:49 -03:00
vcerenu
0edd93c25d Update Wazuh version for Goss test and actions version 2025-05-20 11:44:20 -03:00
Victor Ereñú
34679bc91b Revert "BACKPORT: Agent Docker images code" 2025-05-21 00:40:56 +10:00
Carlos Anguita
ee23975bd7 Merge pull request #1827 from wazuh/enhancement/1825-revert-docker-image-tag 2025-05-16 09:48:29 +02:00
Enrique Araque
8846329d50 Revert image tag for 4.10.2-rc1 2025-05-16 09:46:50 +02:00
Carlos Anguita
9bda0fc4fd Merge pull request #1826 from wazuh/enhancement/1825-bump-revision-rc1 2025-05-16 09:43:09 +02:00
Enrique Araque
b98d98532e Bump revision and change image tag for 4.10.2-rc1 2025-05-16 09:40:47 +02:00
Gonzalo Acuña
a1be73f820 Merge pull request #1807 from wazuh/enhancement/1792-add-wazuh-image
BACKPORT: Agent Docker images code
2025-05-12 14:26:38 -03:00
vcerenu
eb95be535c bump Wazuh agent version and add changelog 2025-05-12 13:45:24 -03:00
vcerenu
acd7acb7da resolving conflicts 2025-05-12 13:37:42 -03:00
vcerenu
f28a7068b1 bump wazuh version into env file 2025-05-12 13:33:44 -03:00
Carlos Anguita
489fd96e42 Merge pull request #1811 from wazuh/enhancement/1810-bump-version 2025-05-12 12:31:59 +02:00
Enrique Araque
3c7436c7c2 Bump version to 4.10.2 2025-05-12 12:24:41 +02:00
vcerenu
00286586aa Add agent load on multinode deployment 2025-05-09 16:11:47 -03:00
vcerenu
bc88c686aa Add agent load on multinode deployment 2025-05-09 15:46:11 -03:00
vcerenu
144301bf7c Add Wazuh agent into multinode workflow 2025-05-09 14:05:58 -03:00
vcerenu
5803392993 Add Wazuh agent into PR test workflow 2025-05-09 11:56:16 -03:00
vcerenu
680b0ac725 Add Wazuh agent into PR test workflow 2025-05-09 11:30:19 -03:00
vcerenu
9b19ca8b33 Add Wazuh agent into PR test workflow 2025-05-09 11:10:17 -03:00
vcerenu
9d7910c0ed Add Wazuh agent into PR test workflow 2025-05-09 10:54:29 -03:00
vcerenu
dbe677b1c0 Add Wazuh agent into PR test workflow 2025-05-09 10:30:49 -03:00
vcerenu
aa2bc74977 Add Wazuh agent into PR test workflow 2025-05-09 10:22:46 -03:00
vcerenu
e4cdd20c6a Modify docker-compose.yml file 2025-05-07 12:28:29 -03:00
vcerenu
097c198e0c Remove comment lines 2025-05-07 10:27:28 -03:00
vcerenu
82392ca998 Modify entrypoint and dockerfile 2025-05-07 10:25:07 -03:00
Enrique Araque
a0c1fd8bf5 Merge pull request #1681 from wazuh/enhancement/1678-revert-docker-image 2025-01-15 11:15:12 +01:00
Enrique Araque
c548f3e096 Revert docker image for 4.10.1-rc1 2025-01-15 11:11:51 +01:00
Carlos Anguita
69b4169fd5 Merge pull request #1680 from wazuh/enhancement/1678-change-docker-image 2025-01-15 11:08:32 +01:00
Enrique Araque
1ee604e4b1 Change docker image for 4.10.1-rc1 2025-01-15 11:05:59 +01:00
Carlos Anguita
5b3f46142e Merge pull request #1679 from wazuh/enhancement/1678-bump-revision-to-41011 2025-01-15 11:01:47 +01:00
Enrique Araque
845f7e59ec Bump revision for 4.10.1-rc1 2025-01-15 10:53:58 +01:00
Gonzalo Acuña
633c50bce6 Merge pull request #1674 from wazuh/bug/1673-add-permanent_data_excps
Add exceptions into PERMANENT_DATA script
2025-01-13 11:41:53 -03:00
vcerenu
347187c411 Add exceptions into PERMANENT_DATA script 2025-01-10 16:02:45 -03:00
Carlos Anguita
7b415dc700 Merge pull request #1670 from wazuh/merge-4.10.0-into-4.10.1 2025-01-10 11:23:43 +01:00
Enrique Araque
f2a5901fd6 Merge 4.10.0 into 4.10.1 2025-01-10 11:18:47 +01:00
Carlos Anguita
2f3f00fc51 Merge pull request #1667 from wazuh/enhancement/1664-revert-docker-image 2025-01-08 10:21:10 +01:00
Enrique Araque
98675f00fc Change docker image for 4.10.0-rc3 2025-01-08 10:16:58 +01:00
Carlos Anguita
26e94102ce Merge pull request #1666 from wazuh/enhancement/1664-change-docker-image 2025-01-08 10:13:02 +01:00
Enrique Araque
fc896872e2 Change docker image for 4.10.0-rc3 2025-01-08 10:10:42 +01:00
Carlos Anguita
e17302f280 Merge pull request #1665 from wazuh/enhancement/1664-bump-revision-41008 2025-01-08 10:07:45 +01:00
Enrique Araque
010642113b Bump revision for 4.10.0-rc3 2025-01-08 10:04:52 +01:00
Gonzalo Acuña
1f7eae1247 Merge pull request #1659 from wazuh/enhancement/1658-bump-4.10.1-version
Bump 4.10.1 version
2024-12-20 10:19:26 -03:00
vcerenu
2c2388ce4a Bump 4.10.1 version 2024-12-20 10:14:29 -03:00
Carlos Anguita
7b03b99022 Merge pull request #1649 from wazuh/enhancement/1646-revert-docker-image 2024-12-18 10:52:16 +01:00
Enrique Araque
8a925f010f Revert docker image for 4.10.0-rc2 2024-12-18 10:47:26 +01:00
Carlos Anguita
8468687b0c Merge pull request #1648 from wazuh/enhancement/1646-change-docker-image 2024-12-18 10:45:58 +01:00
Enrique Araque
da64bb47d5 Change docker image for 4.10.0-rc2 2024-12-18 10:44:05 +01:00
Carlos Anguita
f3b4631bb0 Merge pull request #1647 from wazuh/enhancement/1646-bump-revision-to-41007 2024-12-18 10:41:38 +01:00
Enrique Araque
2c6704652c Bump revision for 4.10.0-rc2 2024-12-18 10:38:59 +01:00
Carlos Anguita
8022d3a7fc Merge pull request #1636 from wazuh/enhancement/1633-revert-docker-image
Revert docker image for 4.10.0-rc1
2024-12-03 11:00:01 +01:00
Enrique Araque
12fab33f52 Revert docker image for 4.10.0-rc1 2024-12-03 10:58:17 +01:00
Carlos Anguita
71dac1f51b Merge pull request #1635 from wazuh/enhancement/1633-change-docker-image
Change docker image for 4.10.0-rc1
2024-12-03 10:55:50 +01:00
Enrique Araque
d31228306c Change docker image for 4.10.0-rc1 2024-12-03 10:53:48 +01:00
Carlos Anguita
d37474e7c9 Merge pull request #1634 from wazuh/enhancement/1633-bump-revision-41006
Bump revision for 4.10.0-rc1
2024-12-03 10:50:00 +01:00
Enrique Araque
3b91ae3668 Bump revision for 4.10.0-rc1 2024-12-03 10:48:18 +01:00
Carlos Anguita
edf7aef3cc Merge pull request #1628 from wazuh/enhancement/1625-revert-docker-image
Revert docker image for 4.10.0-beta1
2024-11-22 10:09:02 +01:00
Enrique Araque
25e21e71da Revert docker image for 4.10.0-beta1 2024-11-22 10:06:44 +01:00
Carlos Anguita
475d29db39 Merge pull request #1627 from wazuh/enhancement/1625-change-docker-image
Change docker image for 4.10.0-beta1
2024-11-22 09:59:02 +01:00
Enrique Araque
bc102ace7f Change docker image for 4.10.0-beta1 2024-11-22 09:56:53 +01:00
Carlos Anguita
08de09cd08 Merge pull request #1626 from wazuh/enhancement/1625-bump-revision-to-41005
Bump revision for 4.10.0-beta1
2024-11-22 09:54:32 +01:00
Enrique Araque
15995ac5db Bump revision for 4.10.0-beta1 2024-11-22 09:52:42 +01:00
Gonzalo Acuña
63f965d0fd Merge pull request #1619 from wazuh/bug/1618-unset-cap
Add unset capabilities
2024-11-13 09:52:07 -03:00
vcerenu
bfa6dfb3b3 Add Changelog 2024-11-13 08:11:40 -03:00
vcerenu
521711bf63 Add unset capabilities 2024-11-12 12:15:02 -03:00
Carlos Anguita
347132b589 Merge pull request #1617 from wazuh/enhancement/1614-revert-docker-image-tag
Revert docker image tag for 4.10.0-alpha3
2024-11-08 12:51:27 +01:00
Enrique Araque
53275bebb9 Revert docker image tag for 4.10.0-alpha3 2024-11-08 12:48:46 +01:00
Carlos Anguita
7ca2862ad3 Merge pull request #1616 from wazuh/enhancement/1614-change-docker-image-tag
Change docker image tag to 4.10.0-alpha3
2024-11-08 12:44:11 +01:00
Enrique Araque
5a13dd99a7 Change docker image tag to 4.10.0-alpha3 2024-11-08 12:41:10 +01:00
Gonzalo Acuña
a9f2263da8 Merge pull request #1615 from wazuh/enhancement/1614-bump-revision-to-41004
Bump revision to 41004 and update missing changelog entries
2024-11-08 08:36:34 -03:00
Enrique Araque
f6928b62e6 Bump revision to 41004 and update missing changelog entries 2024-11-08 12:34:30 +01:00
Carlos Bordon
f9adac8c56 Merge pull request #1607 from wazuh/merge-4.9.2-into-4.10.0
Merge 4.9.2 into 4.10.0
2024-11-04 15:57:10 -03:00
Gonzalo Acuña
8bb96f3d69 Merge branch '4.10.0' into merge-4.9.2-into-4.10.0 2024-11-04 15:50:45 -03:00
Carlos Bordon
574c7b05c7 Merge pull request #1599 from wazuh/enhancement/1596-revert-images-tag
Revert images tag for 4.9.2 rc1
2024-10-28 11:36:46 -03:00
vcerenu
fc563acdaa Revert images tag 2024-10-28 11:34:08 -03:00
Gonzalo Acuña
0778474353 Merge pull request #1598 from wazuh/enhancement/1596-change-image-tag
Change images tag for 4.9.2 rc1
2024-10-28 11:31:22 -03:00
vcerenu
6038fce076 Change images tag 2024-10-28 11:24:12 -03:00
Gonzalo Acuña
3b7fa8d000 Merge pull request #1597 from wazuh/enhancement/1596-bump-revision
Update 4.9.2 Revision
2024-10-28 11:11:51 -03:00
vcerenu
4116634ddd Bump Revision 2024-10-28 11:06:52 -03:00
Carlos Anguita
fbaee58767 Merge pull request #1594 from wazuh/enhancement/1593-new-version-492
Support new wazuh version 4.9.2
2024-10-25 12:29:39 +02:00
Carlos Anguita López
8b18fb613c support new wazuh version 4.9.2 2024-10-25 12:09:57 +02:00
Carlos Anguita
45366e121f Merge pull request #1588 from wazuh/enhancement/1585-revert-image-tag
Revert image tag for 4.10.0-alpha2
2024-10-18 11:02:06 +02:00
Enrique Araque
93ea37158d Revert image tag for 4.10.0-alpha2 2024-10-18 10:59:10 +02:00
Carlos Anguita
1f58526256 Merge pull request #1587 from wazuh/enhancement/change-docker-image-tag
Change image tag for 4.10.0-alpha2
2024-10-18 10:54:30 +02:00
Enrique Araque
041cea8a9a Add alpha2 to docker 4.10.0 images 2024-10-18 10:50:04 +02:00
Carlos Anguita
53db9379b8 Merge pull request #1586 from wazuh/enhancement/1585-bump-revision-41003
Bump revision for 4.10.0-alpha2
2024-10-18 10:46:27 +02:00
Enrique Araque
02074c678e Bump revision to 41003 2024-10-18 10:43:01 +02:00
Gonzalo Acuña
f4e7d1938d Merge pull request #1581 from wazuh/merge-4.9.1-into-4-10-0
Merge 4.9.1 into 4.10.0
2024-10-17 12:28:24 -03:00
vcerenu
691694a38d Resolve conflicts 2024-10-17 12:22:38 -03:00
Gonzalo Acuña
b1f0a1f46a Merge pull request #1573 from wazuh/enhancement/1570-revert-image-tag
Revert image tag to 4.10.0
2024-10-10 13:15:17 -03:00
JESUS D. GARCIA
5795fa154d Revert image tag to 4.10.0 2024-10-10 11:10:29 -05:00
Gonzalo Acuña
424846ae40 Merge pull request #1572 from wazuh/enhancement/1570-docker-compose-version
Update image tag versions to 4.10.0-alpha2
2024-10-10 13:03:03 -03:00
JESUS D. GARCIA
db4133d7a8 Update docker-compose versions 2024-10-10 10:54:12 -05:00
Carlos Bordon
50769ef689 Merge pull request #1571 from wazuh/enhancement/1570-add-support-for-alpha-2
Add support for alpha 2
2024-10-10 12:48:49 -03:00
JESUS D. GARCIA
dbb776690d Bump revision 2024-10-10 10:43:13 -05:00
Gonzalo Acuña
06a797d793 Merge pull request #1568 from wazuh/merge-4.9.1-into-4.10.0
Merge 4.9.1 into 4.10.0
2024-10-10 08:39:25 -03:00
vcerenu
8695a087d5 Resolving merge conflicts 2024-10-10 08:05:07 -03:00
Gonzalo Acuña
cc206659cc Merge pull request #1551 from wazuh/enhancement/1864-improve-push-docker-images-workflow
Improve the push docker images workflow
2024-10-01 15:21:25 -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
David Correa Rodríguez
9d882fcd67 Merge pull request #1541 from wazuh/enhancement/1535-revert-tag
Reverted image tag for 4.10.0-alpha1
2024-09-24 09:36:31 +02:00
David Correa Rodríguez
9e1c33245d Reverted image tag for 4.10.0-alpha1 2024-09-24 09:32:47 +02:00
David Correa Rodríguez
6dfa4a2e32 Merge pull request #1540 from wazuh/enhancement/1535-change-tag
Changed image tag for 4.10.0-alpha1
2024-09-24 09:30:23 +02:00
David Correa Rodríguez
8ab3018e62 Changed image tag for 4.10.0-alpha1 2024-09-24 09:28:31 +02:00
David Correa Rodríguez
e08a3d85db Merge pull request #1539 from wazuh/enhancement/1535-bump-revision
Bumped revision for 4.10.0-alpha1
2024-09-24 09:11:24 +02:00
David Correa Rodríguez
42db717668 Bumped revision for 4.10.0-alpha1 2024-09-24 08:50:11 +02:00
David Correa Rodríguez
7b1d2836fa Merge pull request #1537 from wazuh/merge-4.9.1-into-4.10.0
Merge 4.9.1 into 4.10.0
2024-09-23 12:29:41 +02: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
Jesús García
5771c49f0d Merge pull request #1524 from wazuh/enhancement/5651-new-workflow-push-docker-images
Update the Procedure push docker images workflow file
2024-09-13 12:51:16 -05: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
cd3e8b8b30 Merge pull request #1518 from wazuh/enhancement/5651-new-workflow-push-docker-images
Add the push_docker_images procedure workflow file
2024-09-09 08:44:19 -03:00
JESUS D. GARCIA
f0253ba984 Add Procedure_push_docker_images.yml workflow file 2024-09-06 19:40:54 -05:00
Gonzalo Acuña
d43f85312a Merge pull request #1513 from wazuh/enhancement/1511-merge-4.9.1-into-4.10.0
Merge 4.9.1 into 4.10.0
2024-09-05 14:01:22 -03:00
David Correa Rodríguez
6eb3f60684 Merge pull request #1495 from wazuh/merge-4.9.1-into-4.10.0
Merge 4.9.1 into 4.10.0
2024-08-21 12:24:59 +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
701fdc33bb Merge pull request #1458 from wazuh/merge-4.9.0-into-4.10.0
Merge 4.9.0 into 4.10.0
2024-07-19 12:39:18 +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
Gonzalo Acuña
e74db2ad83 Merge pull request #1416 from wazuh/bug/1346-enable-additional-wazuh-modules-via-dashboard-environment-variables
Removed references to module enabling because they are now enabled by default.
2024-07-04 14:57:56 -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
Carlos Bordon
94b8b655cd Merge pull request #1396 from wazuh/enhancement/1395-bump-4.10.0-version
Bump 4.10.0 version
2024-06-19 10:53:50 -03:00
vcerenu
8019e386bc Bump 4.10.0 version 2024-06-19 10:20:28 -03:00
20 changed files with 301 additions and 120 deletions

6
.env
View File

@@ -1,6 +1,6 @@
WAZUH_VERSION=4.9.1
WAZUH_IMAGE_VERSION=4.9.1
WAZUH_VERSION=4.10.3
WAZUH_IMAGE_VERSION=4.10.3
WAZUH_TAG_REVISION=1
FILEBEAT_TEMPLATE_BRANCH=4.9.1
FILEBEAT_TEMPLATE_BRANCH=4.10.3
WAZUH_FILEBEAT_MODULE=wazuh-filebeat-0.4.tar.gz
WAZUH_UI_REVISION=1

2
.github/.goss.yaml vendored
View File

@@ -56,7 +56,7 @@ package:
wazuh-manager:
installed: true
versions:
- 4.9.1
- 4.10.3
port:
tcp:1514:
listening: true

View File

@@ -0,0 +1,167 @@
run-name: Launch Push Docker Images - ${{ inputs.id }}
name: Push Docker Images
on:
workflow_dispatch:
inputs:
image_tag:
description: 'Docker image tag'
default: '4.10.3'
required: true
docker_reference:
description: 'wazuh-docker reference'
default: 'v4.10.3'
required: false
products:
description: 'Comma-separated list of the image names to build and push'
default: 'wazuh-manager,wazuh-dashboard,wazuh-indexer'
required: true
filebeat_module_version:
description: 'Filebeat module version'
default: '0.4'
required: true
revision:
description: 'Package revision'
default: '1'
required: true
push_images:
description: 'Push images'
type: boolean
default: true
required: true
id:
description: "ID used to identify the workflow uniquely."
type: string
required: false
dev:
description: "Add tag suffix '-dev' to the image tag ?"
type: boolean
default: true
required: false
workflow_call:
inputs:
image_tag:
description: 'Docker image tag'
default: '4.10.3'
required: true
type: string
docker_reference:
description: 'wazuh-docker reference'
default: 'v4.10.3'
required: false
type: string
products:
description: 'Comma-separated list of the image names to build and push'
default: 'wazuh-manager,wazuh-dashboard,wazuh-indexer'
required: true
type: string
filebeat_module_version:
description: 'Filebeat module version'
default: '0.4'
required: true
type: string
revision:
description: 'Package revision'
default: '1'
required: true
type: string
push_images:
description: 'Push images'
type: boolean
default: true
required: true
id:
description: "ID used to identify the workflow uniquely."
type: string
required: false
dev:
description: "Add tag suffix '-dev' to the image tag ?"
type: boolean
default: false
required: false
jobs:
build-and-push:
runs-on: ubuntu-latest
steps:
- name: Print inputs
run: |
echo "---------------------------------------------"
echo "Running Procedure_push_docker_images workflow"
echo "---------------------------------------------"
echo "* BRANCH: ${{ github.ref }}"
echo "* COMMIT: ${{ github.sha }}"
echo "---------------------------------------------"
echo "Inputs provided:"
echo "---------------------------------------------"
echo "* id: ${{ inputs.id }}"
echo "* image_tag: ${{ inputs.image_tag }}"
echo "* docker_reference: ${{ inputs.docker_reference }}"
echo "* products: ${{ inputs.products }}"
echo "* filebeat_module_version: ${{ inputs.filebeat_module_version }}"
echo "* revision: ${{ inputs.revision }}"
echo "* push_images: ${{ inputs.push_images }}"
echo "* dev: ${{ inputs.dev }}"
echo "---------------------------------------------"
- name: Checkout repository
uses: actions/checkout@v4
with:
ref: ${{ inputs.docker_reference }}
- name: Log in to Docker Hub
uses: docker/login-action@v3
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_PASSWORD }}
- name: Install Docker Compose
run: |
sudo apt-get update
sudo apt-get install -y docker-compose
echo "Installed Docker Compose version: $(docker-compose --version)"
- name: Build Wazuh images
run: |
IMAGE_TAG=${{ inputs.image_tag }}
FILEBEAT_MODULE_VERSION=${{ inputs.filebeat_module_version }}
REVISION=${{ inputs.revision }}
if [[ "$IMAGE_TAG" == *"-"* ]]; then
IFS='-' read -r -a tokens <<< "$IMAGE_TAG"
if [ -z "${tokens[1]}" ]; then
echo "Invalid image tag: $IMAGE_TAG"
exit 1
fi
DEV_STAGE=${tokens[1]}
WAZUH_VER=${tokens[0]}
./build-docker-images/build-images.sh -v $WAZUH_VER -r $REVISION -d $DEV_STAGE -f $FILEBEAT_MODULE_VERSION
else
./build-docker-images/build-images.sh -v $IMAGE_TAG -r $REVISION -f $FILEBEAT_MODULE_VERSION
fi
# Save .env file (generated by build-images.sh) contents to $GITHUB_ENV
ENV_FILE_PATH=".env"
if [ -f $ENV_FILE_PATH ]; then
while IFS= read -r line || [ -n "$line" ]; do
echo "$line" >> $GITHUB_ENV
done < $ENV_FILE_PATH
else
echo "The environment file $ENV_FILE_PATH does not exist!"
exit 1
fi
- name: Tag and Push Wazuh images
if: ${{ inputs.push_images }}
run: |
IMAGE_TAG="${{ inputs.image_tag }}$( [ "${{ inputs.dev }}" == "true" ] && echo '-dev' || true )"
IMAGE_NAMES=${{ inputs.products }}
IFS=',' read -r -a images <<< "$IMAGE_NAMES"
for image in "${images[@]}"; do
echo "Tagging and pushing wazuh/$image:${WAZUH_VERSION} to wazuh/$image:$IMAGE_TAG"
docker tag wazuh/$image:${WAZUH_VERSION} wazuh/$image:$IMAGE_TAG
echo "Pushing wazuh/$image:$IMAGE_TAG ..."
docker push wazuh/$image:$IMAGE_TAG
done

View File

@@ -8,7 +8,7 @@ jobs:
steps:
- name: Check out code
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Install docker-compose
run: |
@@ -29,21 +29,21 @@ jobs:
docker save wazuh/wazuh-dashboard:${{env.WAZUH_IMAGE_VERSION}} -o /home/runner/work/wazuh-docker/wazuh-docker/docker-images/wazuh-dashboard.tar
- name: Temporarily save Wazuh manager Docker image
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: docker-artifact-manager
path: /home/runner/work/wazuh-docker/wazuh-docker/docker-images/wazuh-manager.tar
retention-days: 1
- name: Temporarily save Wazuh indexer Docker image
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: docker-artifact-indexer
path: /home/runner/work/wazuh-docker/wazuh-docker/docker-images/wazuh-indexer.tar
retention-days: 1
- name: Temporarily save Wazuh dashboard Docker image
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: docker-artifact-dashboard
path: /home/runner/work/wazuh-docker/wazuh-docker/docker-images/wazuh-dashboard.tar
@@ -66,7 +66,7 @@ jobs:
steps:
- name: Check out code
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Install docker-compose
run: |
@@ -77,17 +77,17 @@ jobs:
run: cat .env > $GITHUB_ENV
- name: Retrieve saved Wazuh indexer Docker image
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: docker-artifact-indexer
- name: Retrieve saved Wazuh manager Docker image
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: docker-artifact-manager
- name: Retrieve saved Wazuh dashboard Docker image
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: docker-artifact-dashboard
@@ -194,7 +194,7 @@ jobs:
steps:
- name: Check out code
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Install docker-compose
run: |
@@ -213,17 +213,17 @@ jobs:
df -h
- name: Retrieve saved Wazuh dashboard Docker image
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: docker-artifact-dashboard
- name: Retrieve saved Wazuh manager Docker image
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: docker-artifact-manager
- name: Retrieve saved Wazuh indexer Docker image
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: docker-artifact-indexer

View File

@@ -30,7 +30,7 @@ jobs:
runs-on: "ubuntu-latest"
steps:
- name: Checkout code
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Installing dependencies
run: |

View File

@@ -30,7 +30,7 @@ jobs:
runs-on: "ubuntu-latest"
steps:
- name: Checkout code
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Installing dependencies
run: |

View File

@@ -30,7 +30,7 @@ jobs:
runs-on: "ubuntu-latest"
steps:
- name: Checkout code
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Installing dependencies
run: |

View File

@@ -1,6 +1,87 @@
# Change Log
All notable changes to this project will be documented in this file.
## [4.10.3]
### Added
- None
### Changed
- None
### Fixed
- None
### Deleted
- None
## [4.10.2]
### Added
- None
### Changed
- None
### Fixed
- Updated docker/login-action module ([#1837](https://github.com/wazuh/wazuh-docker/pull/1837))
### Deleted
- None
## [4.10.1]
### Added
- None
### Changed
- None
### Fixed
- None
### Deleted
- None
## [4.10.0]
### Added
- Improve the push docker images workflow ([#1551](https://github.com/wazuh/wazuh-docker/pull/1551))
- Update the Procedure push docker images workflow file ([#1524](https://github.com/wazuh/wazuh-docker/pull/1524))
- Add the push_docker_images procedure workflow file ([#1518](https://github.com/wazuh/wazuh-docker/pull/1518))
### Changed
- None
### Fixed
- Add unset capabilities. ([#1619](https://github.com/wazuh/wazuh-docker/pull/1619))
- Removed references to module enabling because they are now enabled by default. ([#1416](https://github.com/wazuh/wazuh-docker/pull/1416))
### Deleted
- None
## [4.9.2]
### Added
- Update Wazuh to version [4.9.2](https://github.com/wazuh/wazuh/blob/v4.9.2/CHANGELOG.md#v492)
## [4.9.1]
### Added

View File

@@ -58,20 +58,6 @@ CHECKS_TEMPLATE=true # step once the Wazuh app starts. Values must be
CHECKS_API=true
CHECKS_SETUP=true
EXTENSIONS_PCI=true # Enable PCI Extension
EXTENSIONS_GDPR=true # Enable GDPR Extension
EXTENSIONS_HIPAA=true # Enable HIPAA Extension
EXTENSIONS_NIST=true # Enable NIST Extension
EXTENSIONS_TSC=true # Enable TSC Extension
EXTENSIONS_AUDIT=true # Enable Audit Extension
EXTENSIONS_OSCAP=false # Enable OpenSCAP Extension
EXTENSIONS_CISCAT=false # Enable CISCAT Extension
EXTENSIONS_AWS=false # Enable AWS Extension
EXTENSIONS_GCP=false # Enable GCP Extension
EXTENSIONS_VIRUSTOTAL=false # Enable Virustotal Extension
EXTENSIONS_OSQUERY=false # Enable OSQuery Extension
EXTENSIONS_DOCKER=false # Enable Docker Extension
APP_TIMEOUT=20000 # Defines maximum timeout to be used on the Wazuh app requests
API_SELECTOR=true Defines if the user is allowed to change the selected API directly from the Wazuh app top menu
@@ -192,41 +178,7 @@ WAZUH_MONITORING_REPLICAS=0 ##
| Wazuh version | ODFE | XPACK |
|---------------|---------|--------|
| v4.9.1 | | |
| v4.9.0 | | |
| v4.8.2 | | |
| v4.8.1 | | |
| v4.8.0 | | |
| v4.7.5 | | |
| v4.7.4 | | |
| v4.7.3 | | |
| v4.7.2 | | |
| v4.7.1 | | |
| v4.7.0 | | |
| v4.6.0 | | |
| v4.5.4 | | |
| v4.5.3 | | |
| v4.5.2 | | |
| v4.5.1 | | |
| v4.5.0 | | |
| v4.4.5 | | |
| v4.4.4 | | |
| v4.4.3 | | |
| v4.4.2 | | |
| v4.4.1 | | |
| v4.4.0 | | |
| v4.3.11 | | |
| v4.3.10 | | |
| v4.3.9 | | |
| v4.3.8 | | |
| v4.3.7 | | |
| v4.3.6 | | |
| v4.3.5 | | |
| v4.3.4 | | |
| v4.3.3 | | |
| v4.3.2 | | |
| v4.3.1 | | |
| v4.3.0 | | |
| v4.3.0+ | N/A | N/A |
| v4.2.7 | 1.13.2 | 7.11.2 |
| v4.2.6 | 1.13.2 | 7.11.2 |
| v4.2.5 | 1.13.2 | 7.11.2 |

View File

@@ -1,2 +1,2 @@
WAZUH-DOCKER_VERSION="4.9.1"
REVISION="40914"
WAZUH-DOCKER_VERSION="4.10.3"
REVISION="41031"

View File

@@ -13,7 +13,7 @@ This script initializes the environment variables needed to build each of the im
The script allows you to build images from other versions of Wazuh, to do this you must use the -v or --version argument:
```
$ build-docker-images/build-images.sh -v 4.9.1
$ build-docker-images/build-images.sh -v 4.10.3
```
To get all the available script options use the -h or --help option:
@@ -26,7 +26,7 @@ Usage: build-docker-images/build-images.sh [OPTIONS]
-d, --dev <ref> [Optional] Set the development stage you want to build, example rc1 or beta1, not used by default.
-f, --filebeat-module <ref> [Optional] Set Filebeat module version. By default 0.4.
-r, --revision <rev> [Optional] Package revision. By default 1
-v, --version <ver> [Optional] Set the Wazuh version should be builded. By default, 4.9.1.
-v, --version <ver> [Optional] Set the Wazuh version should be builded. By default, 4.10.3.
-h, --help Show this help.
```

View File

@@ -1,4 +1,4 @@
WAZUH_IMAGE_VERSION=4.9.1
WAZUH_IMAGE_VERSION=4.10.3
WAZUH_VERSION=$(echo $WAZUH_IMAGE_VERSION | sed -e 's/\.//g')
WAZUH_TAG_REVISION=1
WAZUH_CURRENT_VERSION=$(curl --silent https://api.github.com/repos/wazuh/wazuh/releases/latest | grep '["]tag_name["]:' | sed -E 's/.*\"([^\"]+)\".*/\1/' | cut -c 2- | sed -e 's/\.//g')
@@ -12,7 +12,7 @@ IMAGE_VERSION=${WAZUH_IMAGE_VERSION}
# License (version 2) as published by the FSF - Free Software
# Foundation.
WAZUH_IMAGE_VERSION="4.9.1"
WAZUH_IMAGE_VERSION="4.10.3"
WAZUH_TAG_REVISION="1"
WAZUH_DEV_STAGE=""
FILEBEAT_MODULE_VERSION="0.4"
@@ -70,7 +70,7 @@ build() {
echo WAZUH_FILEBEAT_MODULE=$WAZUH_FILEBEAT_MODULE >> .env
echo WAZUH_UI_REVISION=$WAZUH_UI_REVISION >> .env
docker-compose -f build-docker-images/build-images.yml --env-file .env build --no-cache
docker-compose -f build-docker-images/build-images.yml --env-file .env build --no-cache || clean 1
return 0
}

View File

@@ -21,6 +21,8 @@ RUN mkdir -p $INSTALL_DIR/data/wazuh && chmod -R 775 $INSTALL_DIR/data/wazuh
RUN mkdir -p $INSTALL_DIR/data/wazuh/config && chmod -R 775 $INSTALL_DIR/data/wazuh/config
RUN mkdir -p $INSTALL_DIR/data/wazuh/logs && chmod -R 775 $INSTALL_DIR/data/wazuh/logs
COPY config/wazuh.yml $INSTALL_DIR/data/wazuh/config/
RUN setcap 'cap_net_bind_service=-ep' /usr/share/wazuh-dashboard/node/bin/node
RUN setcap 'cap_net_bind_service=-ep' /usr/share/wazuh-dashboard/node/fallback/bin/node
# Generate certificates
COPY config/config.sh .
@@ -48,21 +50,6 @@ ENV PATTERN="" \
CHECKS_TEMPLATE="" \
CHECKS_API="" \
CHECKS_SETUP="" \
EXTENSIONS_PCI="" \
EXTENSIONS_GDPR="" \
EXTENSIONS_HIPAA="" \
EXTENSIONS_NIST="" \
EXTENSIONS_TSC="" \
EXTENSIONS_AUDIT="" \
EXTENSIONS_OSCAP="" \
EXTENSIONS_CISCAT="" \
EXTENSIONS_AWS="" \
EXTENSIONS_GCP="" \
EXTENSIONS_GITHUB=""\
EXTENSIONS_OFFICE=""\
EXTENSIONS_VIRUSTOTAL="" \
EXTENSIONS_OSQUERY="" \
EXTENSIONS_DOCKER="" \
APP_TIMEOUT="" \
API_SELECTOR="" \
IP_SELECTOR="" \

View File

@@ -9,8 +9,8 @@ export CONFIG_DIR=${INSTALLATION_DIR}/config
## Variables
CERT_TOOL=wazuh-certs-tool.sh
PACKAGES_URL=https://packages.wazuh.com/4.9/
PACKAGES_DEV_URL=https://packages-dev.wazuh.com/4.9/
PACKAGES_URL=https://packages.wazuh.com/4.10/
PACKAGES_DEV_URL=https://packages-dev.wazuh.com/4.10/
## Check if the cert tool exists in S3 buckets
CERT_TOOL_PACKAGES=$(curl --silent -I $PACKAGES_URL$CERT_TOOL | grep -E "^HTTP" | awk '{print $2}')

View File

@@ -15,21 +15,6 @@ declare -A CONFIG_MAP=(
[checks.template]=$CHECKS_TEMPLATE
[checks.api]=$CHECKS_API
[checks.setup]=$CHECKS_SETUP
[extensions.pci]=$EXTENSIONS_PCI
[extensions.gdpr]=$EXTENSIONS_GDPR
[extensions.hipaa]=$EXTENSIONS_HIPAA
[extensions.nist]=$EXTENSIONS_NIST
[extensions.tsc]=$EXTENSIONS_TSC
[extensions.audit]=$EXTENSIONS_AUDIT
[extensions.oscap]=$EXTENSIONS_OSCAP
[extensions.ciscat]=$EXTENSIONS_CISCAT
[extensions.aws]=$EXTENSIONS_AWS
[extensions.gcp]=$EXTENSIONS_GCP
[extensions.github]=$EXTENSIONS_GITHUB
[extensions.office]=$EXTENSIONS_OFFICE
[extensions.virustotal]=$EXTENSIONS_VIRUSTOTAL
[extensions.osquery]=$EXTENSIONS_OSQUERY
[extensions.docker]=$EXTENSIONS_DOCKER
[timeout]=$APP_TIMEOUT
[api.selector]=$API_SELECTOR
[ip.selector]=$IP_SELECTOR

View File

@@ -22,8 +22,8 @@ export REPO_DIR=/unattended_installer
## Variables
CERT_TOOL=wazuh-certs-tool.sh
PASSWORD_TOOL=wazuh-passwords-tool.sh
PACKAGES_URL=https://packages.wazuh.com/4.9/
PACKAGES_DEV_URL=https://packages-dev.wazuh.com/4.9/
PACKAGES_URL=https://packages.wazuh.com/4.10/
PACKAGES_DEV_URL=https://packages-dev.wazuh.com/4.10/
## Check if the cert tool exists in S3 buckets
CERT_TOOL_PACKAGES=$(curl --silent -I $PACKAGES_URL$CERT_TOOL | grep -E "^HTTP" | awk '{print $2}')

View File

@@ -82,6 +82,11 @@ PERMANENT_DATA_EXCP[((i++))]="/var/ossec/wodles/azure/azure-logs.py"
PERMANENT_DATA_EXCP[((i++))]="/var/ossec/wodles/azure/db/orm.py"
PERMANENT_DATA_EXCP[((i++))]="/var/ossec/wodles/azure/db/utils.py"
PERMANENT_DATA_EXCP[((i++))]="/var/ossec/wodles/azure/db/__init__.py"
PERMANENT_DATA_EXCP[((i++))]="/var/ossec/wodles/azure/azure_utils.py"
PERMANENT_DATA_EXCP[((i++))]="/var/ossec/wodles/azure/azure_services/__init__.py"
PERMANENT_DATA_EXCP[((i++))]="/var/ossec/wodles/azure/azure_services/analytics.py"
PERMANENT_DATA_EXCP[((i++))]="/var/ossec/wodles/azure/azure_services/graph.py"
PERMANENT_DATA_EXCP[((i++))]="/var/ossec/wodles/azure/azure_services/storage.py"
PERMANENT_DATA_EXCP[((i++))]="/var/ossec/wodles/docker/DockerListener"
PERMANENT_DATA_EXCP[((i++))]="/var/ossec/wodles/docker/DockerListener.py"
PERMANENT_DATA_EXCP[((i++))]="/var/ossec/wodles/gcloud/gcloud"
@@ -89,6 +94,10 @@ PERMANENT_DATA_EXCP[((i++))]="/var/ossec/wodles/gcloud/gcloud.py"
PERMANENT_DATA_EXCP[((i++))]="/var/ossec/wodles/gcloud/integration.py"
PERMANENT_DATA_EXCP[((i++))]="/var/ossec/wodles/gcloud/tools.py"
PERMANENT_DATA_EXCP[((i++))]="/var/ossec/wodles/gcloud/exceptions.py"
PERMANENT_DATA_EXCP[((i++))]="/var/ossec/wodles/gcloud/buckets/bucket.py"
PERMANENT_DATA_EXCP[((i++))]="/var/ossec/wodles/gcloud/buckets/access_logs.py"
PERMANENT_DATA_EXCP[((i++))]="/var/ossec/wodles/gcloud/pubsub/subscriber.py"
PERMANENT_DATA_EXCP[((i++))]="/etc/filebeat/filebeat.yml"
export PERMANENT_DATA_EXCP
# Files mounted in a volume that should be deleted

View File

@@ -8,8 +8,8 @@
## Variables
CERT_TOOL=wazuh-certs-tool.sh
PASSWORD_TOOL=wazuh-passwords-tool.sh
PACKAGES_URL=https://packages.wazuh.com/4.9/
PACKAGES_DEV_URL=https://packages-dev.wazuh.com/4.9/
PACKAGES_URL=https://packages.wazuh.com/4.10/
PACKAGES_DEV_URL=https://packages-dev.wazuh.com/4.10/
## Check if the cert tool exists in S3 buckets
CERT_TOOL_PACKAGES=$(curl --silent -I $PACKAGES_URL$CERT_TOOL | grep -E "^HTTP" | awk '{print $2}')

View File

@@ -3,7 +3,7 @@ version: '3.7'
services:
wazuh.master:
image: wazuh/wazuh-manager:4.9.1
image: wazuh/wazuh-manager:4.10.3
hostname: wazuh.master
restart: always
ulimits:
@@ -45,7 +45,7 @@ services:
- ./config/wazuh_cluster/wazuh_manager.conf:/wazuh-config-mount/etc/ossec.conf
wazuh.worker:
image: wazuh/wazuh-manager:4.9.1
image: wazuh/wazuh-manager:4.10.3
hostname: wazuh.worker
restart: always
ulimits:
@@ -81,7 +81,7 @@ services:
- ./config/wazuh_cluster/wazuh_worker.conf:/wazuh-config-mount/etc/ossec.conf
wazuh1.indexer:
image: wazuh/wazuh-indexer:4.9.1
image: wazuh/wazuh-indexer:4.10.3
hostname: wazuh1.indexer
restart: always
ports:
@@ -107,7 +107,7 @@ services:
- ./config/wazuh_indexer/internal_users.yml:/usr/share/wazuh-indexer/opensearch-security/internal_users.yml
wazuh2.indexer:
image: wazuh/wazuh-indexer:4.9.1
image: wazuh/wazuh-indexer:4.10.3
hostname: wazuh2.indexer
restart: always
environment:
@@ -129,7 +129,7 @@ services:
- ./config/wazuh_indexer/internal_users.yml:/usr/share/wazuh-indexer/opensearch-security/internal_users.yml
wazuh3.indexer:
image: wazuh/wazuh-indexer:4.9.1
image: wazuh/wazuh-indexer:4.10.3
hostname: wazuh3.indexer
restart: always
environment:
@@ -151,7 +151,7 @@ services:
- ./config/wazuh_indexer/internal_users.yml:/usr/share/wazuh-indexer/opensearch-security/internal_users.yml
wazuh.dashboard:
image: wazuh/wazuh-dashboard:4.9.1
image: wazuh/wazuh-dashboard:4.10.3
hostname: wazuh.dashboard
restart: always
ports:

View File

@@ -3,7 +3,7 @@ version: '3.7'
services:
wazuh.manager:
image: wazuh/wazuh-manager:4.9.1
image: wazuh/wazuh-manager:4.10.3
hostname: wazuh.manager
restart: always
ulimits:
@@ -46,7 +46,7 @@ services:
- ./config/wazuh_cluster/wazuh_manager.conf:/wazuh-config-mount/etc/ossec.conf
wazuh.indexer:
image: wazuh/wazuh-indexer:4.9.1
image: wazuh/wazuh-indexer:4.10.3
hostname: wazuh.indexer
restart: always
ports:
@@ -71,7 +71,7 @@ services:
- ./config/wazuh_indexer/internal_users.yml:/usr/share/wazuh-indexer/opensearch-security/internal_users.yml
wazuh.dashboard:
image: wazuh/wazuh-dashboard:4.9.1
image: wazuh/wazuh-dashboard:4.10.3
hostname: wazuh.dashboard
restart: always
ports: