Resolving conflicts

This commit is contained in:
vcerenu
2025-07-25 09:22:48 -03:00
22 changed files with 69 additions and 45 deletions
+8 -2
View File
@@ -1,6 +1,6 @@
# Reference Manual - Getting Started
This section guides you through the initial steps to get your Wazuh-docker (version 4.13.0) environment up and running. We will cover the prerequisites and point you to the deployment instructions.
This section guides you through the initial steps to get your Wazuh-docker (version 4.13.1) environment up and running. We will cover the prerequisites and point you to the deployment instructions.
## Overview
@@ -27,13 +27,19 @@ Before diving into the deployment, please ensure you have reviewed:
Verify that your host system has sufficient RAM, CPU, and disk space. Ensure Docker and Docker Compose are installed and functioning correctly.
2. **Obtain Wazuh-docker Configuration**:
You'll need the Docker Compose files and any associated configuration files from the `wazuh-docker` repository for version 4.13.0.
You'll need the Docker Compose files and any associated configuration files from the `wazuh-docker` repository for version 4.13.1.
```bash
git clone [https://github.com/wazuh/wazuh-docker.git](https://github.com/wazuh/wazuh-docker.git)
cd wazuh-docker
<<<<<<< HEAD
git checkout v4.13.0
# Navigate to the specific directory, e.g., single-node or multi-node
# cd single-node/ (example path)
=======
git checkout v4.13.1
# Navigate to the specific docker-compose directory, e.g., single-node or multi-node
# cd docker-compose/single-node/ (example path)
>>>>>>> f5473f0004a9463426759d562cf05d1c0426fc8d
```
Alternatively, you might download specific `docker-compose.yml` files if provided as part of a release package.