mirror of
https://github.com/wazuh/wazuh-docker.git
synced 2025-11-02 04:53:16 +00:00
Resolving conflicts
This commit is contained in:
@@ -31,15 +31,9 @@ Before diving into the deployment, please ensure you have reviewed:
|
|||||||
```bash
|
```bash
|
||||||
git clone [https://github.com/wazuh/wazuh-docker.git](https://github.com/wazuh/wazuh-docker.git)
|
git clone [https://github.com/wazuh/wazuh-docker.git](https://github.com/wazuh/wazuh-docker.git)
|
||||||
cd wazuh-docker
|
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
|
git checkout v4.13.1
|
||||||
# Navigate to the specific docker-compose directory, e.g., single-node or multi-node
|
# Navigate to the specific docker-compose directory, e.g., single-node or multi-node
|
||||||
# cd docker-compose/single-node/ (example path)
|
# 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.
|
Alternatively, you might download specific `docker-compose.yml` files if provided as part of a release package.
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user