mirror of
				https://github.com/wazuh/wazuh-docker.git
				synced 2025-10-30 19:43:39 +00:00 
			
		
		
		
	Merge pull request #1325 from wazuh/merge-4.8.0-into-4.9.0
Merge 4.8.0 into 4.9.0
This commit is contained in:
		| @@ -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) | - 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 | ## Wazuh Docker v4.7.3 | ||||||
| ### Added | ### Added | ||||||
|  |  | ||||||
|   | |||||||
| @@ -200,6 +200,7 @@ WAZUH_MONITORING_REPLICAS=0         ## | |||||||
| | v4.8.2        |         |        | | | v4.8.2        |         |        | | ||||||
| | v4.8.1        |         |        | | | v4.8.1        |         |        | | ||||||
| | v4.8.0        |         |        | | | v4.8.0        |         |        | | ||||||
|  | | v4.7.4        |         |        | | ||||||
| | v4.7.3        |         |        | | | v4.7.3        |         |        | | ||||||
| | v4.7.2        |         |        | | | v4.7.2        |         |        | | ||||||
| | v4.7.1        |         |        | | | v4.7.1        |         |        | | ||||||
|   | |||||||
| @@ -1,5 +1,5 @@ | |||||||
| # Wazuh Docker Copyright (C) 2017, Wazuh Inc. (License GPLv2) | # 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_VERSION | ||||||
| ARG WAZUH_TAG_REVISION | ARG WAZUH_TAG_REVISION | ||||||
| @@ -42,7 +42,7 @@ RUN mkdir -p $INSTALL_DIR/data/wazuh/logs && chmod -R 775 $INSTALL_DIR/data/wazu | |||||||
| # Add entrypoint | # Add entrypoint | ||||||
| # Add wazuh_app_config | # Add wazuh_app_config | ||||||
| ################################################################################ | ################################################################################ | ||||||
| FROM amazonlinux:2023.3.20240304.0 | FROM amazonlinux:2023 | ||||||
|  |  | ||||||
| # Set environment variables | # Set environment variables | ||||||
| ENV USER="wazuh-dashboard" \ | ENV USER="wazuh-dashboard" \ | ||||||
|   | |||||||
| @@ -1,5 +1,5 @@ | |||||||
| # Wazuh Docker Copyright (C) 2017, Wazuh Inc. (License GPLv2) | # 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_VERSION | ||||||
| ARG WAZUH_TAG_REVISION | ARG WAZUH_TAG_REVISION | ||||||
| @@ -29,7 +29,7 @@ RUN bash config.sh | |||||||
| # Add entrypoint | # Add entrypoint | ||||||
|  |  | ||||||
| ################################################################################ | ################################################################################ | ||||||
| FROM amazonlinux:2023.3.20240304.0 | FROM amazonlinux:2023 | ||||||
|  |  | ||||||
| ENV USER="wazuh-indexer" \ | ENV USER="wazuh-indexer" \ | ||||||
|     GROUP="wazuh-indexer" \ |     GROUP="wazuh-indexer" \ | ||||||
|   | |||||||
| @@ -1,5 +1,5 @@ | |||||||
| # Wazuh Docker Copyright (C) 2017, Wazuh Inc. (License GPLv2) | # 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 | RUN rm /bin/sh && ln -s /bin/bash /bin/sh | ||||||
|  |  | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user