mirror of
				https://github.com/wazuh/wazuh-docker.git
				synced 2025-11-04 05:53:19 +00:00 
			
		
		
		
	Compare commits
	
		
			67 Commits
		
	
	
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| 
						 | 
					d306f942f7 | ||
| 
						 | 
					abde776e1b | ||
| 
						 | 
					b6f628f3c1 | ||
| 
						 | 
					06a5ba5297 | ||
| 
						 | 
					85992aea95 | ||
| 
						 | 
					5057d0f083 | ||
| 
						 | 
					562eb60e0f | ||
| 
						 | 
					58d6ec2953 | ||
| 
						 | 
					300c1bbcdd | ||
| 
						 | 
					1fe7647b47 | ||
| 
						 | 
					bd5e95a2b8 | ||
| 
						 | 
					ce53f0f05e | ||
| 
						 | 
					aa69278c44 | ||
| 
						 | 
					546f3cef9b | ||
| 
						 | 
					754c4b331e | ||
| 
						 | 
					fe0f76bd7b | ||
| 
						 | 
					e4fec103ca | ||
| 
						 | 
					28acd68e6e | ||
| 
						 | 
					fc8a8d6869 | ||
| 
						 | 
					ff7c511f3b | ||
| 
						 | 
					5f689b8802 | ||
| 
						 | 
					3d9981d9fa | ||
| 
						 | 
					06821f172f | ||
| 
						 | 
					660e472b7c | ||
| 
						 | 
					af33c2dd7c | ||
| 
						 | 
					331fb1969e | ||
| 
						 | 
					b88d852b9f | ||
| 
						 | 
					281cde7292 | ||
| 
						 | 
					c9bbf912b0 | ||
| 
						 | 
					7a189605eb | ||
| 
						 | 
					ae32e0111d | ||
| 
						 | 
					e29dd1195b | ||
| 
						 | 
					dafe93039f | ||
| 
						 | 
					0adf702f70 | ||
| 
						 | 
					f49bba385c | ||
| 
						 | 
					a7bb241f8a | ||
| 
						 | 
					6e0311a330 | ||
| 
						 | 
					bc6ab77773 | ||
| 
						 | 
					e4f782f55d | ||
| 
						 | 
					b29bd6b936 | ||
| 
						 | 
					2bed6e2d95 | ||
| 
						 | 
					73253898a2 | ||
| 
						 | 
					2b30318a08 | ||
| 
						 | 
					49fb35633c | ||
| 
						 | 
					052bce7ae1 | ||
| 
						 | 
					5fb9a0b6b1 | ||
| 
						 | 
					34d25df8ad | ||
| 
						 | 
					06e259714c | ||
| 
						 | 
					d2bb16a493 | ||
| 
						 | 
					a7cc8ef16e | ||
| 
						 | 
					79ead0cf55 | ||
| 
						 | 
					90f1d446c1 | ||
| 
						 | 
					23848dc8bf | ||
| 
						 | 
					9e6defa9d1 | ||
| 
						 | 
					2060e2103b | ||
| 
						 | 
					66a1533425 | ||
| 
						 | 
					7cfda0550d | ||
| 
						 | 
					77e548485a | ||
| 
						 | 
					d9a2ebf090 | ||
| 
						 | 
					240f22b19c | ||
| 
						 | 
					5252ce6c53 | ||
| 
						 | 
					5ef484647a | ||
| 
						 | 
					ea0e679c27 | ||
| 
						 | 
					7ca14b9fc8 | ||
| 
						 | 
					42977e3131 | ||
| 
						 | 
					46d6dc8fe5 | ||
| 
						 | 
					08ba82d16d | 
							
								
								
									
										6
									
								
								.env
									
									
									
									
									
								
							
							
						
						
									
										6
									
								
								.env
									
									
									
									
									
								
							@@ -1,6 +1,6 @@
 | 
			
		||||
WAZUH_VERSION=4.10.3
 | 
			
		||||
WAZUH_IMAGE_VERSION=4.10.3
 | 
			
		||||
WAZUH_VERSION=4.11.2
 | 
			
		||||
WAZUH_IMAGE_VERSION=4.11.2
 | 
			
		||||
WAZUH_TAG_REVISION=1
 | 
			
		||||
FILEBEAT_TEMPLATE_BRANCH=4.10.3
 | 
			
		||||
FILEBEAT_TEMPLATE_BRANCH=4.11.2
 | 
			
		||||
WAZUH_FILEBEAT_MODULE=wazuh-filebeat-0.4.tar.gz
 | 
			
		||||
WAZUH_UI_REVISION=1
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										2
									
								
								.github/.goss.yaml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										2
									
								
								.github/.goss.yaml
									
									
									
									
										vendored
									
									
								
							@@ -56,7 +56,7 @@ package:
 | 
			
		||||
  wazuh-manager:
 | 
			
		||||
    installed: true
 | 
			
		||||
    versions:
 | 
			
		||||
    - 4.10.3
 | 
			
		||||
    - 4.11.2
 | 
			
		||||
port:
 | 
			
		||||
  tcp:1514:
 | 
			
		||||
    listening: true
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										245
									
								
								.github/free-disk-space/action.yml
									
									
									
									
										vendored
									
									
										Normal file
									
								
							
							
						
						
									
										245
									
								
								.github/free-disk-space/action.yml
									
									
									
									
										vendored
									
									
										Normal file
									
								
							@@ -0,0 +1,245 @@
 | 
			
		||||
name: "Free Disk Space (Ubuntu)"
 | 
			
		||||
description: "A configurable GitHub Action to free up disk space on an Ubuntu GitHub Actions runner."
 | 
			
		||||
 | 
			
		||||
# Thanks @jlumbroso for the action code https://github.com/jlumbroso/free-disk-space/
 | 
			
		||||
# See: https://docs.github.com/en/actions/creating-actions/metadata-syntax-for-github-actions#branding
 | 
			
		||||
 | 
			
		||||
inputs:
 | 
			
		||||
  android:
 | 
			
		||||
    description: "Remove Android runtime"
 | 
			
		||||
    required: false
 | 
			
		||||
    default: "true"
 | 
			
		||||
  dotnet:
 | 
			
		||||
    description: "Remove .NET runtime"
 | 
			
		||||
    required: false
 | 
			
		||||
    default: "true"
 | 
			
		||||
  haskell:
 | 
			
		||||
    description: "Remove Haskell runtime"
 | 
			
		||||
    required: false
 | 
			
		||||
    default: "true"
 | 
			
		||||
 | 
			
		||||
  # option inspired by:
 | 
			
		||||
  # https://github.com/apache/flink/blob/master/tools/azure-pipelines/free_disk_space.sh
 | 
			
		||||
  large-packages:
 | 
			
		||||
    description: "Remove large packages"
 | 
			
		||||
    required: false
 | 
			
		||||
    default: "true"
 | 
			
		||||
 | 
			
		||||
  docker-images:
 | 
			
		||||
    description: "Remove Docker images"
 | 
			
		||||
    required: false
 | 
			
		||||
    default: "true"
 | 
			
		||||
 | 
			
		||||
  # option inspired by:
 | 
			
		||||
  # https://github.com/actions/virtual-environments/issues/2875#issuecomment-1163392159
 | 
			
		||||
  tool-cache:
 | 
			
		||||
    description: "Remove image tool cache"
 | 
			
		||||
    required: false
 | 
			
		||||
    default: "false"
 | 
			
		||||
 | 
			
		||||
  swap-storage:
 | 
			
		||||
    description: "Remove swap storage"
 | 
			
		||||
    required: false
 | 
			
		||||
    default: "true"
 | 
			
		||||
 | 
			
		||||
runs:
 | 
			
		||||
  using: "composite"
 | 
			
		||||
  steps:
 | 
			
		||||
    - shell: bash
 | 
			
		||||
      run: |
 | 
			
		||||
 | 
			
		||||
        # ======
 | 
			
		||||
        # MACROS
 | 
			
		||||
        # ======
 | 
			
		||||
 | 
			
		||||
        # macro to print a line of equals
 | 
			
		||||
        # (silly but works)
 | 
			
		||||
        printSeparationLine() {
 | 
			
		||||
          str=${1:=}
 | 
			
		||||
          num=${2:-80}
 | 
			
		||||
          counter=1
 | 
			
		||||
          output=""
 | 
			
		||||
          while [ $counter -le $num ]
 | 
			
		||||
          do
 | 
			
		||||
             output="${output}${str}"
 | 
			
		||||
             counter=$((counter+1))
 | 
			
		||||
          done
 | 
			
		||||
          echo "${output}"
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
        # macro to compute available space
 | 
			
		||||
        # REF: https://unix.stackexchange.com/a/42049/60849
 | 
			
		||||
        # REF: https://stackoverflow.com/a/450821/408734
 | 
			
		||||
        getAvailableSpace() { echo $(df -a $1 | awk 'NR > 1 {avail+=$4} END {print avail}'); }
 | 
			
		||||
 | 
			
		||||
        # macro to make Kb human readable (assume the input is Kb)
 | 
			
		||||
        # REF: https://unix.stackexchange.com/a/44087/60849
 | 
			
		||||
        formatByteCount() { echo $(numfmt --to=iec-i --suffix=B --padding=7 $1'000'); }
 | 
			
		||||
 | 
			
		||||
        # macro to output saved space
 | 
			
		||||
        printSavedSpace() {
 | 
			
		||||
          saved=${1}
 | 
			
		||||
          title=${2:-}
 | 
			
		||||
 | 
			
		||||
          echo ""
 | 
			
		||||
          printSeparationLine '*' 80
 | 
			
		||||
          if [ ! -z "${title}" ]; then
 | 
			
		||||
            echo "=> ${title}: Saved $(formatByteCount $saved)"
 | 
			
		||||
          else
 | 
			
		||||
            echo "=> Saved $(formatByteCount $saved)"
 | 
			
		||||
          fi
 | 
			
		||||
          printSeparationLine '*' 80
 | 
			
		||||
          echo ""
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
        # macro to print output of dh with caption
 | 
			
		||||
        printDH() {
 | 
			
		||||
          caption=${1:-}
 | 
			
		||||
 | 
			
		||||
          printSeparationLine '=' 80
 | 
			
		||||
          echo "${caption}"
 | 
			
		||||
          echo ""
 | 
			
		||||
          echo "$ dh -h /"
 | 
			
		||||
          echo ""
 | 
			
		||||
          df -h /
 | 
			
		||||
          echo "$ dh -a /"
 | 
			
		||||
          echo ""
 | 
			
		||||
          df -a /
 | 
			
		||||
          echo "$ dh -a"
 | 
			
		||||
          echo ""
 | 
			
		||||
          df -a
 | 
			
		||||
          printSeparationLine '=' 80
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
        # ======
 | 
			
		||||
        # SCRIPT
 | 
			
		||||
        # ======
 | 
			
		||||
 | 
			
		||||
        # Display initial disk space stats
 | 
			
		||||
 | 
			
		||||
        AVAILABLE_INITIAL=$(getAvailableSpace)
 | 
			
		||||
        AVAILABLE_ROOT_INITIAL=$(getAvailableSpace '/')
 | 
			
		||||
 | 
			
		||||
        printDH "BEFORE CLEAN-UP:"
 | 
			
		||||
        echo ""
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
        # Option: Remove Android library
 | 
			
		||||
 | 
			
		||||
        if [[ ${{ inputs.android }} == 'true' ]]; then
 | 
			
		||||
          BEFORE=$(getAvailableSpace)
 | 
			
		||||
          
 | 
			
		||||
          sudo rm -rf /usr/local/lib/android || true
 | 
			
		||||
 | 
			
		||||
          AFTER=$(getAvailableSpace)
 | 
			
		||||
          SAVED=$((AFTER-BEFORE))
 | 
			
		||||
          printSavedSpace $SAVED "Android library"
 | 
			
		||||
        fi
 | 
			
		||||
 | 
			
		||||
        # Option: Remove .NET runtime
 | 
			
		||||
 | 
			
		||||
        if [[ ${{ inputs.dotnet }} == 'true' ]]; then
 | 
			
		||||
          BEFORE=$(getAvailableSpace)
 | 
			
		||||
 | 
			
		||||
          # https://github.community/t/bigger-github-hosted-runners-disk-space/17267/11
 | 
			
		||||
          sudo rm -rf /usr/share/dotnet || true
 | 
			
		||||
          
 | 
			
		||||
          AFTER=$(getAvailableSpace)
 | 
			
		||||
          SAVED=$((AFTER-BEFORE))
 | 
			
		||||
          printSavedSpace $SAVED ".NET runtime"
 | 
			
		||||
        fi
 | 
			
		||||
 | 
			
		||||
        # Option: Remove Haskell runtime
 | 
			
		||||
 | 
			
		||||
        if [[ ${{ inputs.haskell }} == 'true' ]]; then
 | 
			
		||||
          BEFORE=$(getAvailableSpace)
 | 
			
		||||
 | 
			
		||||
          sudo rm -rf /opt/ghc || true
 | 
			
		||||
          sudo rm -rf /usr/local/.ghcup || true
 | 
			
		||||
          
 | 
			
		||||
          AFTER=$(getAvailableSpace)
 | 
			
		||||
          SAVED=$((AFTER-BEFORE))
 | 
			
		||||
          printSavedSpace $SAVED "Haskell runtime"
 | 
			
		||||
        fi
 | 
			
		||||
 | 
			
		||||
        # Option: Remove large packages
 | 
			
		||||
        # REF: https://github.com/apache/flink/blob/master/tools/azure-pipelines/free_disk_space.sh
 | 
			
		||||
 | 
			
		||||
        if [[ ${{ inputs.large-packages }} == 'true' ]]; then
 | 
			
		||||
          BEFORE=$(getAvailableSpace)
 | 
			
		||||
          
 | 
			
		||||
          sudo apt-get remove -y '^aspnetcore-.*' || echo "::warning::The command [sudo apt-get remove -y '^aspnetcore-.*'] failed to complete successfully. Proceeding..."
 | 
			
		||||
          sudo apt-get remove -y '^dotnet-.*' --fix-missing || echo "::warning::The command [sudo apt-get remove -y '^dotnet-.*' --fix-missing] failed to complete successfully. Proceeding..."
 | 
			
		||||
          sudo apt-get remove -y '^llvm-.*' --fix-missing || echo "::warning::The command [sudo apt-get remove -y '^llvm-.*' --fix-missing] failed to complete successfully. Proceeding..."
 | 
			
		||||
          sudo apt-get remove -y 'php.*' --fix-missing || echo "::warning::The command [sudo apt-get remove -y 'php.*' --fix-missing] failed to complete successfully. Proceeding..."
 | 
			
		||||
          sudo apt-get remove -y '^mongodb-.*' --fix-missing || echo "::warning::The command [sudo apt-get remove -y '^mongodb-.*' --fix-missing] failed to complete successfully. Proceeding..."
 | 
			
		||||
          sudo apt-get remove -y '^mysql-.*' --fix-missing || echo "::warning::The command [sudo apt-get remove -y '^mysql-.*' --fix-missing] failed to complete successfully. Proceeding..."
 | 
			
		||||
          sudo apt-get remove -y azure-cli google-chrome-stable firefox powershell mono-devel libgl1-mesa-dri --fix-missing || echo "::warning::The command [sudo apt-get remove -y azure-cli google-chrome-stable firefox powershell mono-devel libgl1-mesa-dri --fix-missing] failed to complete successfully. Proceeding..."
 | 
			
		||||
          sudo apt-get remove -y google-cloud-sdk --fix-missing || echo "::debug::The command [sudo apt-get remove -y google-cloud-sdk --fix-missing] failed to complete successfully. Proceeding..."
 | 
			
		||||
          sudo apt-get remove -y google-cloud-cli --fix-missing || echo "::debug::The command [sudo apt-get remove -y google-cloud-cli --fix-missing] failed to complete successfully. Proceeding..."
 | 
			
		||||
          sudo apt-get autoremove -y || echo "::warning::The command [sudo apt-get autoremove -y] failed to complete successfully. Proceeding..."
 | 
			
		||||
          sudo apt-get clean || echo "::warning::The command [sudo apt-get clean] failed to complete successfully. Proceeding..."
 | 
			
		||||
 | 
			
		||||
          AFTER=$(getAvailableSpace)
 | 
			
		||||
          SAVED=$((AFTER-BEFORE))
 | 
			
		||||
          printSavedSpace $SAVED "Large misc. packages"
 | 
			
		||||
        fi
 | 
			
		||||
 | 
			
		||||
        # Option: Remove Docker images
 | 
			
		||||
 | 
			
		||||
        if [[ ${{ inputs.docker-images }} == 'true' ]]; then
 | 
			
		||||
          BEFORE=$(getAvailableSpace)
 | 
			
		||||
 | 
			
		||||
          sudo docker image prune --all --force || true
 | 
			
		||||
 | 
			
		||||
          AFTER=$(getAvailableSpace)
 | 
			
		||||
          SAVED=$((AFTER-BEFORE))
 | 
			
		||||
          printSavedSpace $SAVED "Docker images"
 | 
			
		||||
        fi
 | 
			
		||||
 | 
			
		||||
        # Option: Remove tool cache
 | 
			
		||||
        # REF: https://github.com/actions/virtual-environments/issues/2875#issuecomment-1163392159
 | 
			
		||||
 | 
			
		||||
        if [[ ${{ inputs.tool-cache }} == 'true' ]]; then
 | 
			
		||||
          BEFORE=$(getAvailableSpace)
 | 
			
		||||
 | 
			
		||||
          sudo rm -rf "$AGENT_TOOLSDIRECTORY" || true
 | 
			
		||||
          
 | 
			
		||||
          AFTER=$(getAvailableSpace)
 | 
			
		||||
          SAVED=$((AFTER-BEFORE))
 | 
			
		||||
          printSavedSpace $SAVED "Tool cache"
 | 
			
		||||
        fi
 | 
			
		||||
 | 
			
		||||
        # Option: Remove Swap storage
 | 
			
		||||
 | 
			
		||||
        if [[ ${{ inputs.swap-storage }} == 'true' ]]; then
 | 
			
		||||
          BEFORE=$(getAvailableSpace)
 | 
			
		||||
 | 
			
		||||
          sudo swapoff -a || true
 | 
			
		||||
          sudo rm -f /mnt/swapfile || true
 | 
			
		||||
          free -h
 | 
			
		||||
          
 | 
			
		||||
          AFTER=$(getAvailableSpace)
 | 
			
		||||
          SAVED=$((AFTER-BEFORE))
 | 
			
		||||
          printSavedSpace $SAVED "Swap storage"
 | 
			
		||||
        fi
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
        # Output saved space statistic
 | 
			
		||||
 | 
			
		||||
        AVAILABLE_END=$(getAvailableSpace)
 | 
			
		||||
        AVAILABLE_ROOT_END=$(getAvailableSpace '/')
 | 
			
		||||
 | 
			
		||||
        echo ""
 | 
			
		||||
        printDH "AFTER CLEAN-UP:"
 | 
			
		||||
 | 
			
		||||
        echo ""
 | 
			
		||||
        echo ""
 | 
			
		||||
 | 
			
		||||
        echo "/dev/root:"
 | 
			
		||||
        printSavedSpace $((AVAILABLE_ROOT_END - AVAILABLE_ROOT_INITIAL))
 | 
			
		||||
        echo "overall:"
 | 
			
		||||
        printSavedSpace $((AVAILABLE_END - AVAILABLE_INITIAL))
 | 
			
		||||
@@ -6,12 +6,12 @@ on:
 | 
			
		||||
    inputs:
 | 
			
		||||
      image_tag:
 | 
			
		||||
        description: 'Docker image tag'
 | 
			
		||||
        default: '4.10.3'
 | 
			
		||||
        default: '4.11.2'
 | 
			
		||||
        required: true
 | 
			
		||||
      docker_reference:
 | 
			
		||||
        description: 'wazuh-docker reference'
 | 
			
		||||
        default: 'v4.10.3'
 | 
			
		||||
        required: false
 | 
			
		||||
        default: 'v4.11.2'
 | 
			
		||||
        required: true
 | 
			
		||||
      products:
 | 
			
		||||
        description: 'Comma-separated list of the image names to build and push'
 | 
			
		||||
        default: 'wazuh-manager,wazuh-dashboard,wazuh-indexer'
 | 
			
		||||
@@ -42,12 +42,12 @@ on:
 | 
			
		||||
    inputs:
 | 
			
		||||
      image_tag:
 | 
			
		||||
        description: 'Docker image tag'
 | 
			
		||||
        default: '4.10.3'
 | 
			
		||||
        default: '4.11.2'
 | 
			
		||||
        required: true
 | 
			
		||||
        type: string
 | 
			
		||||
      docker_reference:
 | 
			
		||||
        description: 'wazuh-docker reference'
 | 
			
		||||
        default: 'v4.10.3'
 | 
			
		||||
        default: 'v4.11.2'
 | 
			
		||||
        required: false
 | 
			
		||||
        type: string
 | 
			
		||||
      products:
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										13
									
								
								.github/workflows/push.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										13
									
								
								.github/workflows/push.yml
									
									
									
									
										vendored
									
									
								
							@@ -8,7 +8,7 @@ jobs:
 | 
			
		||||
    steps:
 | 
			
		||||
 | 
			
		||||
    - name: Check out code
 | 
			
		||||
      uses: actions/checkout@v4
 | 
			
		||||
      uses: actions/checkout@v3
 | 
			
		||||
 | 
			
		||||
    - name: Install docker-compose
 | 
			
		||||
      run: |
 | 
			
		||||
@@ -66,7 +66,7 @@ jobs:
 | 
			
		||||
    steps:
 | 
			
		||||
 | 
			
		||||
    - name: Check out code
 | 
			
		||||
      uses: actions/checkout@v4
 | 
			
		||||
      uses: actions/checkout@v3
 | 
			
		||||
 | 
			
		||||
    - name: Install docker-compose
 | 
			
		||||
      run: |
 | 
			
		||||
@@ -194,7 +194,7 @@ jobs:
 | 
			
		||||
    steps:
 | 
			
		||||
 | 
			
		||||
    - name: Check out code
 | 
			
		||||
      uses: actions/checkout@v4
 | 
			
		||||
      uses: actions/checkout@v3
 | 
			
		||||
 | 
			
		||||
    - name: Install docker-compose
 | 
			
		||||
      run: |
 | 
			
		||||
@@ -205,12 +205,7 @@ jobs:
 | 
			
		||||
      run: cat .env > $GITHUB_ENV
 | 
			
		||||
 | 
			
		||||
    - name: free disk space
 | 
			
		||||
      run: |
 | 
			
		||||
        sudo swapoff -a
 | 
			
		||||
        sudo rm -f /swapfile
 | 
			
		||||
        sudo apt clean
 | 
			
		||||
        docker rmi $(docker image ls -aq)
 | 
			
		||||
        df -h
 | 
			
		||||
      uses: ./.github/free-disk-space
 | 
			
		||||
 | 
			
		||||
    - name: Retrieve saved Wazuh dashboard Docker image
 | 
			
		||||
      uses: actions/download-artifact@v4
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										2
									
								
								.github/workflows/trivy-dashboard.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										2
									
								
								.github/workflows/trivy-dashboard.yml
									
									
									
									
										vendored
									
									
								
							@@ -30,7 +30,7 @@ jobs:
 | 
			
		||||
    runs-on: "ubuntu-latest"
 | 
			
		||||
    steps:
 | 
			
		||||
      - name: Checkout code
 | 
			
		||||
        uses: actions/checkout@v4
 | 
			
		||||
        uses: actions/checkout@v3
 | 
			
		||||
 | 
			
		||||
      - name: Installing dependencies
 | 
			
		||||
        run: |
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										2
									
								
								.github/workflows/trivy-indexer.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										2
									
								
								.github/workflows/trivy-indexer.yml
									
									
									
									
										vendored
									
									
								
							@@ -30,7 +30,7 @@ jobs:
 | 
			
		||||
    runs-on: "ubuntu-latest"
 | 
			
		||||
    steps:
 | 
			
		||||
      - name: Checkout code
 | 
			
		||||
        uses: actions/checkout@v4
 | 
			
		||||
        uses: actions/checkout@v3
 | 
			
		||||
 | 
			
		||||
      - name: Installing dependencies
 | 
			
		||||
        run: |
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										2
									
								
								.github/workflows/trivy-manager.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										2
									
								
								.github/workflows/trivy-manager.yml
									
									
									
									
										vendored
									
									
								
							@@ -30,7 +30,7 @@ jobs:
 | 
			
		||||
    runs-on: "ubuntu-latest"
 | 
			
		||||
    steps:
 | 
			
		||||
      - name: Checkout code
 | 
			
		||||
        uses: actions/checkout@v4
 | 
			
		||||
        uses: actions/checkout@v3
 | 
			
		||||
 | 
			
		||||
      - name: Installing dependencies
 | 
			
		||||
        run: |
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										24
									
								
								CHANGELOG.md
									
									
									
									
									
								
							
							
						
						
									
										24
									
								
								CHANGELOG.md
									
									
									
									
									
								
							@@ -1,7 +1,7 @@
 | 
			
		||||
# Change Log
 | 
			
		||||
All notable changes to this project will be documented in this file.
 | 
			
		||||
 | 
			
		||||
## [4.10.3]
 | 
			
		||||
## [4.11.2]
 | 
			
		||||
 | 
			
		||||
### Added
 | 
			
		||||
 | 
			
		||||
@@ -19,7 +19,7 @@ All notable changes to this project will be documented in this file.
 | 
			
		||||
 | 
			
		||||
- None
 | 
			
		||||
 | 
			
		||||
## [4.10.2]
 | 
			
		||||
## [4.11.1]
 | 
			
		||||
 | 
			
		||||
### Added
 | 
			
		||||
 | 
			
		||||
@@ -31,7 +31,25 @@ All notable changes to this project will be documented in this file.
 | 
			
		||||
 | 
			
		||||
### Fixed
 | 
			
		||||
 | 
			
		||||
- Updated docker/login-action module ([#1837](https://github.com/wazuh/wazuh-docker/pull/1837))
 | 
			
		||||
- None
 | 
			
		||||
 | 
			
		||||
### Deleted
 | 
			
		||||
 | 
			
		||||
- None
 | 
			
		||||
 | 
			
		||||
## [4.11.0]
 | 
			
		||||
 | 
			
		||||
### Added
 | 
			
		||||
 | 
			
		||||
- None
 | 
			
		||||
 | 
			
		||||
### Changed
 | 
			
		||||
 | 
			
		||||
- None
 | 
			
		||||
 | 
			
		||||
### Fixed
 | 
			
		||||
 | 
			
		||||
- Change the cleaning disk step ([#1663](https://github.com/wazuh/wazuh-docker/pull/1663))
 | 
			
		||||
 | 
			
		||||
### Deleted
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										42
									
								
								README.md
									
									
									
									
									
								
							
							
						
						
									
										42
									
								
								README.md
									
									
									
									
									
								
							@@ -178,7 +178,47 @@ WAZUH_MONITORING_REPLICAS=0         ##
 | 
			
		||||
 | 
			
		||||
| Wazuh version | ODFE    | XPACK  |
 | 
			
		||||
|---------------|---------|--------|
 | 
			
		||||
| v4.3.0+       |   N/A   |   N/A  |
 | 
			
		||||
| v4.11.2       |         |        |
 | 
			
		||||
| v4.11.1       |         |        |
 | 
			
		||||
| v4.11.0       |         |        |
 | 
			
		||||
| v4.10.1       |         |        |
 | 
			
		||||
| v4.10.0       |         |        |
 | 
			
		||||
| v4.9.2        |         |        |
 | 
			
		||||
| v4.9.1        |         |        |
 | 
			
		||||
| v4.9.0        |         |        |
 | 
			
		||||
| v4.8.2        |         |        |
 | 
			
		||||
| v4.8.1        |         |        |
 | 
			
		||||
| v4.8.0        |         |        |
 | 
			
		||||
| v4.7.5        |         |        |
 | 
			
		||||
| v4.7.4        |         |        |
 | 
			
		||||
| v4.7.3        |         |        |
 | 
			
		||||
| v4.7.2        |         |        |
 | 
			
		||||
| v4.7.1        |         |        |
 | 
			
		||||
| v4.7.0        |         |        |
 | 
			
		||||
| v4.6.0        |         |        |
 | 
			
		||||
| v4.5.4        |         |        |
 | 
			
		||||
| v4.5.3        |         |        |
 | 
			
		||||
| v4.5.2        |         |        |
 | 
			
		||||
| v4.5.1        |         |        |
 | 
			
		||||
| v4.5.0        |         |        |
 | 
			
		||||
| v4.4.5        |         |        |
 | 
			
		||||
| v4.4.4        |         |        |
 | 
			
		||||
| v4.4.3        |         |        |
 | 
			
		||||
| v4.4.2        |         |        |
 | 
			
		||||
| v4.4.1        |         |        |
 | 
			
		||||
| v4.4.0        |         |        |
 | 
			
		||||
| v4.3.11       |         |        |
 | 
			
		||||
| v4.3.10       |         |        |
 | 
			
		||||
| v4.3.9        |         |        |
 | 
			
		||||
| v4.3.8        |         |        |
 | 
			
		||||
| v4.3.7        |         |        |
 | 
			
		||||
| v4.3.6        |         |        |
 | 
			
		||||
| v4.3.5        |         |        |
 | 
			
		||||
| v4.3.4        |         |        |
 | 
			
		||||
| v4.3.3        |         |        |
 | 
			
		||||
| v4.3.2        |         |        |
 | 
			
		||||
| v4.3.1        |         |        |
 | 
			
		||||
| v4.3.0        |         |        |
 | 
			
		||||
| v4.2.7        | 1.13.2  | 7.11.2 |
 | 
			
		||||
| v4.2.6        | 1.13.2  | 7.11.2 |
 | 
			
		||||
| v4.2.5        | 1.13.2  | 7.11.2 |
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										4
									
								
								VERSION
									
									
									
									
									
								
							
							
						
						
									
										4
									
								
								VERSION
									
									
									
									
									
								
							@@ -1,2 +1,2 @@
 | 
			
		||||
WAZUH-DOCKER_VERSION="4.10.3"
 | 
			
		||||
REVISION="41031"
 | 
			
		||||
WAZUH-DOCKER_VERSION="4.11.2"
 | 
			
		||||
REVISION="41122"
 | 
			
		||||
 
 | 
			
		||||
@@ -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.10.3
 | 
			
		||||
$ build-docker-images/build-images.sh -v 4.11.2
 | 
			
		||||
```
 | 
			
		||||
 | 
			
		||||
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.10.3.
 | 
			
		||||
    -v, --version <ver>          [Optional] Set the Wazuh version should be builded. By default, 4.11.2.
 | 
			
		||||
    -h, --help                   Show this help.
 | 
			
		||||
 | 
			
		||||
```
 | 
			
		||||
@@ -1,4 +1,4 @@
 | 
			
		||||
WAZUH_IMAGE_VERSION=4.10.3
 | 
			
		||||
WAZUH_IMAGE_VERSION=4.11.2
 | 
			
		||||
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.10.3"
 | 
			
		||||
WAZUH_IMAGE_VERSION="4.11.2"
 | 
			
		||||
WAZUH_TAG_REVISION="1"
 | 
			
		||||
WAZUH_DEV_STAGE=""
 | 
			
		||||
FILEBEAT_MODULE_VERSION="0.4"
 | 
			
		||||
 
 | 
			
		||||
@@ -9,8 +9,8 @@ export CONFIG_DIR=${INSTALLATION_DIR}/config
 | 
			
		||||
 | 
			
		||||
## Variables
 | 
			
		||||
CERT_TOOL=wazuh-certs-tool.sh
 | 
			
		||||
PACKAGES_URL=https://packages.wazuh.com/4.10/
 | 
			
		||||
PACKAGES_DEV_URL=https://packages-dev.wazuh.com/4.10/
 | 
			
		||||
PACKAGES_URL=https://packages.wazuh.com/4.11/
 | 
			
		||||
PACKAGES_DEV_URL=https://packages-dev.wazuh.com/4.11/
 | 
			
		||||
 | 
			
		||||
## Check if the cert tool exists in S3 buckets
 | 
			
		||||
CERT_TOOL_PACKAGES=$(curl --silent -I $PACKAGES_URL$CERT_TOOL | grep -E "^HTTP" | awk  '{print $2}')
 | 
			
		||||
 
 | 
			
		||||
@@ -22,8 +22,8 @@ export REPO_DIR=/unattended_installer
 | 
			
		||||
## Variables
 | 
			
		||||
CERT_TOOL=wazuh-certs-tool.sh
 | 
			
		||||
PASSWORD_TOOL=wazuh-passwords-tool.sh
 | 
			
		||||
PACKAGES_URL=https://packages.wazuh.com/4.10/
 | 
			
		||||
PACKAGES_DEV_URL=https://packages-dev.wazuh.com/4.10/
 | 
			
		||||
PACKAGES_URL=https://packages.wazuh.com/4.11/
 | 
			
		||||
PACKAGES_DEV_URL=https://packages-dev.wazuh.com/4.11/
 | 
			
		||||
 | 
			
		||||
## Check if the cert tool exists in S3 buckets
 | 
			
		||||
CERT_TOOL_PACKAGES=$(curl --silent -I $PACKAGES_URL$CERT_TOOL | grep -E "^HTTP" | awk  '{print $2}')
 | 
			
		||||
 
 | 
			
		||||
@@ -97,7 +97,6 @@ PERMANENT_DATA_EXCP[((i++))]="/var/ossec/wodles/gcloud/exceptions.py"
 | 
			
		||||
PERMANENT_DATA_EXCP[((i++))]="/var/ossec/wodles/gcloud/buckets/bucket.py"
 | 
			
		||||
PERMANENT_DATA_EXCP[((i++))]="/var/ossec/wodles/gcloud/buckets/access_logs.py"
 | 
			
		||||
PERMANENT_DATA_EXCP[((i++))]="/var/ossec/wodles/gcloud/pubsub/subscriber.py"
 | 
			
		||||
PERMANENT_DATA_EXCP[((i++))]="/etc/filebeat/filebeat.yml"
 | 
			
		||||
export PERMANENT_DATA_EXCP
 | 
			
		||||
 | 
			
		||||
# Files mounted in a volume that should be deleted
 | 
			
		||||
 
 | 
			
		||||
@@ -8,8 +8,8 @@
 | 
			
		||||
## Variables
 | 
			
		||||
CERT_TOOL=wazuh-certs-tool.sh
 | 
			
		||||
PASSWORD_TOOL=wazuh-passwords-tool.sh
 | 
			
		||||
PACKAGES_URL=https://packages.wazuh.com/4.10/
 | 
			
		||||
PACKAGES_DEV_URL=https://packages-dev.wazuh.com/4.10/
 | 
			
		||||
PACKAGES_URL=https://packages.wazuh.com/4.11/
 | 
			
		||||
PACKAGES_DEV_URL=https://packages-dev.wazuh.com/4.11/
 | 
			
		||||
 | 
			
		||||
## Check if the cert tool exists in S3 buckets
 | 
			
		||||
CERT_TOOL_PACKAGES=$(curl --silent -I $PACKAGES_URL$CERT_TOOL | grep -E "^HTTP" | awk  '{print $2}')
 | 
			
		||||
 
 | 
			
		||||
@@ -3,7 +3,7 @@ version: '3.7'
 | 
			
		||||
 | 
			
		||||
services:
 | 
			
		||||
  wazuh.master:
 | 
			
		||||
    image: wazuh/wazuh-manager:4.10.3
 | 
			
		||||
    image: wazuh/wazuh-manager:4.11.2
 | 
			
		||||
    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.10.3
 | 
			
		||||
    image: wazuh/wazuh-manager:4.11.2
 | 
			
		||||
    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.10.3
 | 
			
		||||
    image: wazuh/wazuh-indexer:4.11.2
 | 
			
		||||
    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.10.3
 | 
			
		||||
    image: wazuh/wazuh-indexer:4.11.2
 | 
			
		||||
    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.10.3
 | 
			
		||||
    image: wazuh/wazuh-indexer:4.11.2
 | 
			
		||||
    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.10.3
 | 
			
		||||
    image: wazuh/wazuh-dashboard:4.11.2
 | 
			
		||||
    hostname: wazuh.dashboard
 | 
			
		||||
    restart: always
 | 
			
		||||
    ports:
 | 
			
		||||
 
 | 
			
		||||
@@ -3,7 +3,7 @@ version: '3.7'
 | 
			
		||||
 | 
			
		||||
services:
 | 
			
		||||
  wazuh.manager:
 | 
			
		||||
    image: wazuh/wazuh-manager:4.10.3
 | 
			
		||||
    image: wazuh/wazuh-manager:4.11.2
 | 
			
		||||
    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.10.3
 | 
			
		||||
    image: wazuh/wazuh-indexer:4.11.2
 | 
			
		||||
    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.10.3
 | 
			
		||||
    image: wazuh/wazuh-dashboard:4.11.2
 | 
			
		||||
    hostname: wazuh.dashboard
 | 
			
		||||
    restart: always
 | 
			
		||||
    ports:
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user