Resolving merge conflicts

2025-11-03 21:43:17 +00:00 · 2025-02-04 09:31:51 -03:00
parent f49bba385c c4bef8df3e
commit 6e432a133d
17 changed files with 51 additions and 42 deletions
--- a/.env
+++ b/.env
@@ -1,6 +1,6 @@
-WAZUH_VERSION=4.11.0
-WAZUH_IMAGE_VERSION=4.11.0
+WAZUH_VERSION=4.12.0
+WAZUH_IMAGE_VERSION=4.12.0
 WAZUH_TAG_REVISION=1
-FILEBEAT_TEMPLATE_BRANCH=4.11.0
+FILEBEAT_TEMPLATE_BRANCH=4.12.0
 WAZUH_FILEBEAT_MODULE=wazuh-filebeat-0.4.tar.gz
 WAZUH_UI_REVISION=1
--- a/.github/.goss.yaml
+++ b/.github/.goss.yaml
@@ -56,7 +56,7 @@ package:
  wazuh-manager:
    installed: true
    versions:
-    - 4.11.0
+    - 4.12.0
 port:
  tcp:1514:
    listening: true
--- a/.github/free-disk-space/action.yml
+++ b/.github/free-disk-space/action.yml
@@ -242,4 +242,4 @@ runs:
        echo "/dev/root:"
        printSavedSpace $((AVAILABLE_ROOT_END - AVAILABLE_ROOT_INITIAL))
        echo "overall:"
-        printSavedSpace $((AVAILABLE_END - AVAILABLE_INITIAL))
+        printSavedSpace $((AVAILABLE_END - AVAILABLE_INITIAL))
--- a/.github/workflows/Procedure_push_docker_images.yml
+++ b/.github/workflows/Procedure_push_docker_images.yml
@@ -6,11 +6,11 @@ on:
    inputs:
      image_tag:
        description: 'Docker image tag'
-        default: '4.11.0'
+        default: '4.12.0'
        required: true
      docker_reference:
        description: 'wazuh-docker reference'
-        default: 'v4.11.0'
+        default: 'v4.12.0'
        required: true
      products:
        description: 'Comma-separated list of the image names to build and push'
@@ -42,12 +42,12 @@ on:
    inputs:
      image_tag:
        description: 'Docker image tag'
-        default: '4.11.0'
+        default: '4.12.0'
        required: true
        type: string
      docker_reference:
        description: 'wazuh-docker reference'
-        default: 'v4.11.0'
+        default: 'v4.12.0'
        required: false
        type: string
      products:
@@ -82,7 +82,7 @@ on:

 jobs:
  build-and-push:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04

    steps:
    - name: Print inputs
--- a/.github/workflows/push.yml
+++ b/.github/workflows/push.yml
@@ -4,7 +4,7 @@ on: [pull_request]

 jobs:
  build-docker-images:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
    steps:

    - name: Check out code
@@ -61,7 +61,7 @@ jobs:
        GOSS_FILE: .github/.goss.yaml

  check-single-node:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
    needs: build-docker-images
    steps:

@@ -189,7 +189,7 @@ jobs:
      run: ./.github/single-node-log-check.sh

  check-multi-node:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
    needs: build-docker-images
    steps:

--- a/.github/workflows/trivy-dashboard.yml
+++ b/.github/workflows/trivy-dashboard.yml
@@ -27,7 +27,7 @@ jobs:
      security-events: write # for github/codeql-action/upload-sarif to upload SARIF results

    name: Build images and upload Trivy results
-    runs-on: "ubuntu-latest"
+    runs-on: "ubuntu-22.04"
    steps:
      - name: Checkout code
        uses: actions/checkout@v3
--- a/.github/workflows/trivy-indexer.yml
+++ b/.github/workflows/trivy-indexer.yml
@@ -27,7 +27,7 @@ jobs:
      security-events: write # for github/codeql-action/upload-sarif to upload SARIF results

    name: Build images and upload Trivy results
-    runs-on: "ubuntu-latest"
+    runs-on: "ubuntu-22.04"
    steps:
      - name: Checkout code
        uses: actions/checkout@v3
--- a/.github/workflows/trivy-manager.yml
+++ b/.github/workflows/trivy-manager.yml
@@ -27,7 +27,7 @@ jobs:
      security-events: write # for github/codeql-action/upload-sarif to upload SARIF results

    name: Build images and upload Trivy results
-    runs-on: "ubuntu-latest"
+    runs-on: "ubuntu-22.04"
    steps:
      - name: Checkout code
        uses: actions/checkout@v3
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,22 @@
 # Change Log
 All notable changes to this project will be documented in this file.

+## [4.12.0]
+
+### Added
+
+- None
+
+### Changed
+
+- None
+
+### Fixed
+
+- Fix permanent data scripts ([#1603](https://github.com/wazuh/wazuh-docker/pull/1603))
+
+### Deleted
+
 ## [4.11.0]

 ### Added
--- a/README.md
+++ b/README.md
@@ -178,6 +178,7 @@ WAZUH_MONITORING_REPLICAS=0         ##

 | Wazuh version | ODFE    | XPACK  |
 |---------------|---------|--------|
+| v4.12.0       |         |        |
 | v4.11.0       |         |        |
 | v4.10.1       |         |        |
 | v4.10.0       |         |        |
--- a/4
+++ b/4
@@ -1,2 +1,2 @@
-WAZUH-DOCKER_VERSION="4.11.0"
-REVISION="41101"
+WAZUH-DOCKER_VERSION="4.12.0"
+REVISION="41200"
--- a/build-docker-images/README.md
+++ b/build-docker-images/README.md
@@ -13,7 +13,7 @@ This script initializes the environment variables needed to build each of the im
 The script allows you to build images from other versions of Wazuh, to do this you must use the -v or --version argument:

 ```
-$ build-docker-images/build-images.sh -v 4.11.0
+$ build-docker-images/build-images.sh -v 4.12.0
 ```

 To get all the available script options use the -h or --help option:
@@ -26,7 +26,7 @@ Usage: build-docker-images/build-images.sh [OPTIONS]
    -d, --dev <ref>              [Optional] Set the development stage you want to build, example rc1 or beta1, not used by default.
    -f, --filebeat-module <ref>  [Optional] Set Filebeat module version. By default 0.4.
    -r, --revision <rev>         [Optional] Package revision. By default 1
-    -v, --version <ver>          [Optional] Set the Wazuh version should be builded. By default, 4.11.0.
+    -v, --version <ver>          [Optional] Set the Wazuh version should be builded. By default, 4.12.0.
    -h, --help                   Show this help.

 ```
--- a/build-docker-images/build-images.sh
+++ b/build-docker-images/build-images.sh
@@ -1,4 +1,4 @@
-WAZUH_IMAGE_VERSION=4.11.0
+WAZUH_IMAGE_VERSION=4.12.0
 WAZUH_VERSION=$(echo $WAZUH_IMAGE_VERSION | sed -e 's/\.//g')
 WAZUH_TAG_REVISION=1
 WAZUH_CURRENT_VERSION=$(curl --silent https://api.github.com/repos/wazuh/wazuh/releases/latest | grep '["]tag_name["]:' | sed -E 's/.*\"([^\"]+)\".*/\1/' | cut -c 2- | sed -e 's/\.//g')
@@ -12,7 +12,7 @@ IMAGE_VERSION=${WAZUH_IMAGE_VERSION}
 # License (version 2) as published by the FSF - Free Software
 # Foundation.

-WAZUH_IMAGE_VERSION="4.11.0"
+WAZUH_IMAGE_VERSION="4.12.0"
 WAZUH_TAG_REVISION="1"
 WAZUH_DEV_STAGE=""
 FILEBEAT_MODULE_VERSION="0.4"
--- a/build-docker-images/wazuh-manager/config/etc/cont-init.d/0-wazuh-init
+++ b/build-docker-images/wazuh-manager/config/etc/cont-init.d/0-wazuh-init
@@ -47,12 +47,8 @@ mount_permanent_data() {
    if find ${permanent_dir} -mindepth 1 | read; then
      print "The path ${permanent_dir} is already mounted"
    else
-      if find ${data_tmp} -mindepth 1 | read; then
        print "Installing ${permanent_dir}"
-        exec_cmd "cp -a ${data_tmp}. ${permanent_dir}"
-      else
-        print "The path ${permanent_dir} is empty, skipped"
-      fi
+        exec_cmd "cp -ar ${data_tmp}. ${permanent_dir}"
    fi
  done
 }
--- a/build-docker-images/wazuh-manager/config/permanent_data.sh
+++ b/build-docker-images/wazuh-manager/config/permanent_data.sh
@@ -30,11 +30,7 @@ mkdir ${PERMANENT_PATH}
 for permanent_dir in "${PERMANENT_DATA[@]}"; do
  # Create the directory for the permanent file if it does not exist
  DIR=$(dirname "${permanent_dir}")
-  if [ ! -e ${PERMANENT_PATH}${DIR}  ]
-  then
-    mkdir -p ${PERMANENT_PATH}${DIR}
-  fi
-  
-  mv ${permanent_dir} ${PERMANENT_PATH}${permanent_dir}
+  mkdir -p ${PERMANENT_PATH}${DIR}
+  cp -ar ${permanent_dir} ${PERMANENT_PATH}${DIR}

 done
--- a/multi-node/docker-compose.yml
+++ b/multi-node/docker-compose.yml
@@ -3,7 +3,7 @@ version: '3.7'

 services:
  wazuh.master:
-    image: wazuh/wazuh-manager:4.11.0
+    image: wazuh/wazuh-manager:4.12.0
    hostname: wazuh.master
    restart: always
    ulimits:
@@ -45,7 +45,7 @@ services:
      - ./config/wazuh_cluster/wazuh_manager.conf:/wazuh-config-mount/etc/ossec.conf

  wazuh.worker:
-    image: wazuh/wazuh-manager:4.11.0
+    image: wazuh/wazuh-manager:4.12.0
    hostname: wazuh.worker
    restart: always
    ulimits:
@@ -81,7 +81,7 @@ services:
      - ./config/wazuh_cluster/wazuh_worker.conf:/wazuh-config-mount/etc/ossec.conf

  wazuh1.indexer:
-    image: wazuh/wazuh-indexer:4.11.0
+    image: wazuh/wazuh-indexer:4.12.0
    hostname: wazuh1.indexer
    restart: always
    ports:
@@ -107,7 +107,7 @@ services:
      - ./config/wazuh_indexer/internal_users.yml:/usr/share/wazuh-indexer/opensearch-security/internal_users.yml

  wazuh2.indexer:
-    image: wazuh/wazuh-indexer:4.11.0
+    image: wazuh/wazuh-indexer:4.12.0
    hostname: wazuh2.indexer
    restart: always
    environment:
@@ -129,7 +129,7 @@ services:
      - ./config/wazuh_indexer/internal_users.yml:/usr/share/wazuh-indexer/opensearch-security/internal_users.yml

  wazuh3.indexer:
-    image: wazuh/wazuh-indexer:4.11.0
+    image: wazuh/wazuh-indexer:4.12.0
    hostname: wazuh3.indexer
    restart: always
    environment:
@@ -151,7 +151,7 @@ services:
      - ./config/wazuh_indexer/internal_users.yml:/usr/share/wazuh-indexer/opensearch-security/internal_users.yml

  wazuh.dashboard:
-    image: wazuh/wazuh-dashboard:4.11.0
+    image: wazuh/wazuh-dashboard:4.12.0
    hostname: wazuh.dashboard
    restart: always
    ports:
--- a/single-node/docker-compose.yml
+++ b/single-node/docker-compose.yml
@@ -3,7 +3,7 @@ version: '3.7'

 services:
  wazuh.manager:
-    image: wazuh/wazuh-manager:4.11.0
+    image: wazuh/wazuh-manager:4.12.0
    hostname: wazuh.manager
    restart: always
    ulimits:
@@ -46,7 +46,7 @@ services:
      - ./config/wazuh_cluster/wazuh_manager.conf:/wazuh-config-mount/etc/ossec.conf

  wazuh.indexer:
-    image: wazuh/wazuh-indexer:4.11.0
+    image: wazuh/wazuh-indexer:4.12.0
    hostname: wazuh.indexer
    restart: always
    ports:
@@ -71,7 +71,7 @@ services:
      - ./config/wazuh_indexer/internal_users.yml:/usr/share/wazuh-indexer/opensearch-security/internal_users.yml

  wazuh.dashboard:
-    image: wazuh/wazuh-dashboard:4.11.0
+    image: wazuh/wazuh-dashboard:4.12.0
    hostname: wazuh.dashboard
    restart: always
    ports: