Compare commits

...
Author SHA1 Message Date
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
14 changed files with 57 additions and 38 deletions
+3 -3
View File
@@ -1,6 +1,6 @@
WAZUH_VERSION=4.10.1
WAZUH_IMAGE_VERSION=4.10.1
WAZUH_VERSION=4.10.2
WAZUH_IMAGE_VERSION=4.10.2
WAZUH_TAG_REVISION=1
FILEBEAT_TEMPLATE_BRANCH=4.10.1
FILEBEAT_TEMPLATE_BRANCH=4.10.2
WAZUH_FILEBEAT_MODULE=wazuh-filebeat-0.4.tar.gz
WAZUH_UI_REVISION=1
+1 -1
View File
@@ -56,7 +56,7 @@ package:
wazuh-manager:
installed: true
versions:
- 4.10.1-1
- 4.10.2
port:
tcp:1514:
listening: true
@@ -6,11 +6,11 @@ on:
inputs:
image_tag:
description: 'Docker image tag'
default: '4.10.1'
default: '4.10.2'
required: true
docker_reference:
description: 'wazuh-docker reference'
default: 'v4.10.1'
default: 'v4.10.2'
required: false
products:
description: 'Comma-separated list of the image names to build and push'
@@ -42,12 +42,12 @@ on:
inputs:
image_tag:
description: 'Docker image tag'
default: '4.10.1'
default: '4.10.2'
required: true
type: string
docker_reference:
description: 'wazuh-docker reference'
default: 'v4.10.1'
default: 'v4.10.2'
required: false
type: string
products:
+12 -12
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
+1 -1
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: |
+1 -1
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: |
+1 -1
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: |
+18
View File
@@ -1,6 +1,24 @@
# Change Log
All notable changes to this project will be documented in this file.
## [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
+1
View File
@@ -178,6 +178,7 @@ WAZUH_MONITORING_REPLICAS=0 ##
| Wazuh version | ODFE | XPACK |
|---------------|---------|--------|
| v4.10.2 | | |
| v4.10.1 | | |
| v4.10.0 | | |
| v4.9.2 | | |
+2 -2
View File
@@ -1,2 +1,2 @@
WAZUH-DOCKER_VERSION="4.10.1"
REVISION="41011"
WAZUH-DOCKER_VERSION="4.10.2"
REVISION="41021"
+2 -2
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.10.1
$ build-docker-images/build-images.sh -v 4.10.2
```
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.10.1.
-v, --version <ver> [Optional] Set the Wazuh version should be builded. By default, 4.10.2.
-h, --help Show this help.
```
+2 -2
View File
@@ -1,4 +1,4 @@
WAZUH_IMAGE_VERSION=4.10.1
WAZUH_IMAGE_VERSION=4.10.2
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.10.1"
WAZUH_IMAGE_VERSION="4.10.2"
WAZUH_TAG_REVISION="1"
WAZUH_DEV_STAGE=""
FILEBEAT_MODULE_VERSION="0.4"
+6 -6
View File
@@ -3,7 +3,7 @@ version: '3.7'
services:
wazuh.master:
image: wazuh/wazuh-manager:4.10.1
image: wazuh/wazuh-manager:4.10.2
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.10.1
image: wazuh/wazuh-manager:4.10.2
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.10.1
image: wazuh/wazuh-indexer:4.10.2
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.10.1
image: wazuh/wazuh-indexer:4.10.2
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.10.1
image: wazuh/wazuh-indexer:4.10.2
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.10.1
image: wazuh/wazuh-dashboard:4.10.2
hostname: wazuh.dashboard
restart: always
ports:
+3 -3
View File
@@ -3,7 +3,7 @@ version: '3.7'
services:
wazuh.manager:
image: wazuh/wazuh-manager:4.10.1
image: wazuh/wazuh-manager:4.10.2
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.10.1
image: wazuh/wazuh-indexer:4.10.2
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.10.1
image: wazuh/wazuh-dashboard:4.10.2
hostname: wazuh.dashboard
restart: always
ports: