Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge 4.9.0 into master #1327

Merged
merged 28 commits into from
Apr 30, 2024
+11 −5
Merged

Merge 4.9.0 into master #1327

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
cbeb18c
Bumped revision to 40807
davidcr01 Apr 5, 2024
74e30e8
Merge pull request #1288 from wazuh/bump-revision-40807
davidcr01 Apr 5, 2024
92d6f87
Changed Docker base image ocurrences from amazonlinux:2023.3.20240304…
CarlosALgit Apr 10, 2024
b62a1d5
Merge pull request #1294 from wazuh/1293-fix-480-beta5-al2023-vulnera…
teddytpc1 Apr 10, 2024
d904595
Bumped version to 4.7.4
davidcr01 Apr 18, 2024
d2181f7
Merge pull request #1300 from wazuh/bump-version-4.7.4
teddytpc1 Apr 18, 2024
353ea59
Bumped revision to 40808
davidcr01 Apr 19, 2024
c9cf940
Merge pull request #1303 from wazuh/bump-revision-40808
vcerenu Apr 19, 2024
650d293
add beta6 tag
vcerenu Apr 19, 2024
a9efe64
Merge pull request #1304 from wazuh/beta6-tag
vcerenu Apr 19, 2024
72421d6
revert beta6 changes
vcerenu Apr 19, 2024
1e7d1c6
Merge pull request #1305 from wazuh/revert-beta6
vcerenu Apr 19, 2024
8c87423
Bumped revision to 40716
davidcr01 Apr 23, 2024
9881957
Merge pull request #1309 from wazuh/bump-revision-40716
davidcr01 Apr 23, 2024
daf1e83
Updated tag for 4.7.4 RC1
davidcr01 Apr 23, 2024
2efc6c5
Merge pull request #1310 from wazuh/change-tag-4.7.4-rc1
davidcr01 Apr 23, 2024
9109104
Reverted tag for 4.7.4 RC1
davidcr01 Apr 23, 2024
3bed3a3
Merge pull request #1311 from wazuh/revert-tag-4.7.4-rc1
davidcr01 Apr 23, 2024
ee3159b
bump revision
vcerenu Apr 25, 2024
81c42d0
Merge pull request #1316 from wazuh/bump-revision-474
vcerenu Apr 25, 2024
b760931
change image version
vcerenu Apr 25, 2024
d10af3b
Merge pull request #1317 from wazuh/change-image-rc2
davidcr01 Apr 25, 2024
ce0a855
rollback image name
vcerenu Apr 25, 2024
ec76ea8
Merge pull request #1318 from wazuh/rollback-image-version
davidcr01 Apr 25, 2024
4c74ebf
resolving conflicts
vcerenu Apr 30, 2024
7063480
Merge pull request #1324 from wazuh/merge-4.7.4-into-4.8.0
vcerenu Apr 30, 2024
390a71e
resolving conflicts
vcerenu Apr 30, 2024
b022f9f
Merge pull request #1325 from wazuh/merge-4.8.0-into-4.9.0
vcerenu Apr 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,11 @@ All notable changes to this project will be documented in this file.

- Update Wazuh to version [4.8.0](https://github.com/wazuh/wazuh/blob/v4.8.0/CHANGELOG.md#v480)

## Wazuh Docker v4.7.4
### Added

- Update Wazuh to version [4.7.4](https://github.com/wazuh/wazuh/blob/v4.7.4/CHANGELOG.md#v474)

## Wazuh Docker v4.7.3
### Added

Expand Down
1 change: 1 addition & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,6 +200,7 @@ WAZUH_MONITORING_REPLICAS=0 ##
| v4.8.2 | | |
| v4.8.1 | | |
| v4.8.0 | | |
| v4.7.4 | | |
| v4.7.3 | | |
| v4.7.2 | | |
| v4.7.1 | | |
Expand Down
4 changes: 2 additions & 2 deletions build-docker-images/wazuh-dashboard/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Wazuh Docker Copyright (C) 2017, Wazuh Inc. (License GPLv2)
FROM amazonlinux:2023.3.20240304.0 AS builder
FROM amazonlinux:2023 AS builder

ARG WAZUH_VERSION
ARG WAZUH_TAG_REVISION
Expand Down Expand Up @@ -42,7 +42,7 @@ RUN mkdir -p $INSTALL_DIR/data/wazuh/logs && chmod -R 775 $INSTALL_DIR/data/wazu
# Add entrypoint
# Add wazuh_app_config
################################################################################
FROM amazonlinux:2023.3.20240304.0
FROM amazonlinux:2023

# Set environment variables
ENV USER="wazuh-dashboard" \
Expand Down
4 changes: 2 additions & 2 deletions build-docker-images/wazuh-indexer/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Wazuh Docker Copyright (C) 2017, Wazuh Inc. (License GPLv2)
FROM amazonlinux:2023.3.20240304.0 AS builder
FROM amazonlinux:2023 AS builder

ARG WAZUH_VERSION
ARG WAZUH_TAG_REVISION
Expand Down Expand Up @@ -29,7 +29,7 @@ RUN bash config.sh
# Add entrypoint

################################################################################
FROM amazonlinux:2023.3.20240304.0
FROM amazonlinux:2023

ENV USER="wazuh-indexer" \
GROUP="wazuh-indexer" \
Expand Down
2 changes: 1 addition & 1 deletion build-docker-images/wazuh-manager/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Wazuh Docker Copyright (C) 2017, Wazuh Inc. (License GPLv2)
FROM amazonlinux:2023.3.20240304.0
FROM amazonlinux:2023

RUN rm /bin/sh && ln -s /bin/bash /bin/sh

Expand Down
Loading