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.

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.10.1 into 4.10.2 #1639

Merged
merged 24 commits into from
Dec 13, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
f6928b6
Bump revision to 41004 and update missing changelog entries
Enaraque Nov 8, 2024
a9f2263
Merge pull request #1615 from wazuh/enhancement/1614-bump-revision-to…
teddytpc1 Nov 8, 2024
5a13dd9
Change docker image tag to 4.10.0-alpha3
Enaraque Nov 8, 2024
7ca2862
Merge pull request #1616 from wazuh/enhancement/1614-change-docker-im…
CarlosALgit Nov 8, 2024
53275be
Revert docker image tag for 4.10.0-alpha3
Enaraque Nov 8, 2024
347132b
Merge pull request #1617 from wazuh/enhancement/1614-revert-docker-im…
CarlosALgit Nov 8, 2024
521711b
Add unset capabilities
vcerenu Nov 12, 2024
bfa6dfb
Add Changelog
vcerenu Nov 13, 2024
63f965d
Merge pull request #1619 from wazuh/bug/1618-unset-cap
teddytpc1 Nov 13, 2024
15995ac
Bump revision for 4.10.0-beta1
Enaraque Nov 22, 2024
08de09c
Merge pull request #1626 from wazuh/enhancement/1625-bump-revision-to…
CarlosALgit Nov 22, 2024
bc102ac
Change docker image for 4.10.0-beta1
Enaraque Nov 22, 2024
475d29d
Merge pull request #1627 from wazuh/enhancement/1625-change-docker-image
CarlosALgit Nov 22, 2024
25e21e7
Revert docker image for 4.10.0-beta1
Enaraque Nov 22, 2024
edf7aef
Merge pull request #1628 from wazuh/enhancement/1625-revert-docker-image
CarlosALgit Nov 22, 2024
3b91ae3
Bump revision for 4.10.0-rc1
Enaraque Dec 3, 2024
d37474e
Merge pull request #1634 from wazuh/enhancement/1633-bump-revision-41006
CarlosALgit Dec 3, 2024
d312283
Change docker image for 4.10.0-rc1
Enaraque Dec 3, 2024
71dac1f
Merge pull request #1635 from wazuh/enhancement/1633-change-docker-image
CarlosALgit Dec 3, 2024
12fab33
Revert docker image for 4.10.0-rc1
Enaraque Dec 3, 2024
8022d3a
Merge pull request #1636 from wazuh/enhancement/1633-revert-docker-image
CarlosALgit Dec 3, 2024
240f22b
Merge 4.10.0 into 4.10.1
Enaraque Dec 13, 2024
d9a2ebf
Merge pull request #1638 from wazuh/merge-4.10.0-into-4.10.1
teddytpc1 Dec 13, 2024
0980cf0
Merge branch '4.10.1' into merge-4.10.1-into-4.10.2
Enaraque Dec 13, 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
7 changes: 5 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -41,15 +41,18 @@ All notable changes to this project will be documented in this file.

### Added

- Migrate the push docker images procedure to GitHub Actions ([#5651](https://github.com/wazuh/wazuh-qa/issues/5651))
- 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

- None
- 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

Expand Down
2 changes: 2 additions & 0 deletions build-docker-images/wazuh-dashboard/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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 .
Expand Down
Loading