mirror of
				https://github.com/wazuh/wazuh-docker.git
				synced 2025-10-30 19:43:39 +00:00 
			
		
		
		
	Compare commits
	
		
			116 Commits
		
	
	
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
|  | 083b7b6571 | ||
|  | 1c9e8b2c01 | ||
|  | a59789e29a | ||
|  | 13090a5446 | ||
|  | 0edd93c25d | ||
|  | 34679bc91b | ||
|  | ee23975bd7 | ||
|  | 8846329d50 | ||
|  | 9bda0fc4fd | ||
|  | b98d98532e | ||
|  | a1be73f820 | ||
|  | eb95be535c | ||
|  | acd7acb7da | ||
|  | f28a7068b1 | ||
|  | 489fd96e42 | ||
|  | 3c7436c7c2 | ||
|  | 00286586aa | ||
|  | bc88c686aa | ||
|  | 144301bf7c | ||
|  | 5803392993 | ||
|  | 680b0ac725 | ||
|  | 9b19ca8b33 | ||
|  | 9d7910c0ed | ||
|  | dbe677b1c0 | ||
|  | aa2bc74977 | ||
|  | e4cdd20c6a | ||
|  | 097c198e0c | ||
|  | 82392ca998 | ||
|  | a0c1fd8bf5 | ||
|  | c548f3e096 | ||
|  | 69b4169fd5 | ||
|  | 1ee604e4b1 | ||
|  | 5b3f46142e | ||
|  | 845f7e59ec | ||
|  | 633c50bce6 | ||
|  | 347187c411 | ||
|  | 7b415dc700 | ||
|  | f2a5901fd6 | ||
|  | 2f3f00fc51 | ||
|  | 98675f00fc | ||
|  | 26e94102ce | ||
|  | fc896872e2 | ||
|  | e17302f280 | ||
|  | 010642113b | ||
|  | 1f7eae1247 | ||
|  | 2c2388ce4a | ||
|  | 7b03b99022 | ||
|  | 8a925f010f | ||
|  | 8468687b0c | ||
|  | da64bb47d5 | ||
|  | f3b4631bb0 | ||
|  | 2c6704652c | ||
|  | 8022d3a7fc | ||
|  | 12fab33f52 | ||
|  | 71dac1f51b | ||
|  | d31228306c | ||
|  | d37474e7c9 | ||
|  | 3b91ae3668 | ||
|  | edf7aef3cc | ||
|  | 25e21e71da | ||
|  | 475d29db39 | ||
|  | bc102ace7f | ||
|  | 08de09cd08 | ||
|  | 15995ac5db | ||
|  | 63f965d0fd | ||
|  | bfa6dfb3b3 | ||
|  | 521711bf63 | ||
|  | 347132b589 | ||
|  | 53275bebb9 | ||
|  | 7ca2862ad3 | ||
|  | 5a13dd99a7 | ||
|  | a9f2263da8 | ||
|  | f6928b62e6 | ||
|  | f9adac8c56 | ||
|  | 8bb96f3d69 | ||
|  | 45366e121f | ||
|  | 93ea37158d | ||
|  | 1f58526256 | ||
|  | 041cea8a9a | ||
|  | 53db9379b8 | ||
|  | 02074c678e | ||
|  | f4e7d1938d | ||
|  | 691694a38d | ||
|  | b1f0a1f46a | ||
|  | 5795fa154d | ||
|  | 424846ae40 | ||
|  | db4133d7a8 | ||
|  | 50769ef689 | ||
|  | dbb776690d | ||
|  | 06a797d793 | ||
|  | 8695a087d5 | ||
|  | cc206659cc | ||
|  | 8bafe1295b | ||
|  | 027b26047f | ||
|  | 9d882fcd67 | ||
|  | 9e1c33245d | ||
|  | 6dfa4a2e32 | ||
|  | 8ab3018e62 | ||
|  | e08a3d85db | ||
|  | 42db717668 | ||
|  | 7b1d2836fa | ||
|  | 301ea9e21a | ||
|  | 5771c49f0d | ||
|  | 471aedae5b | ||
|  | b38b3c7e59 | ||
|  | cd3e8b8b30 | ||
|  | f0253ba984 | ||
|  | d43f85312a | ||
|  | 6eb3f60684 | ||
|  | bbc4529088 | ||
|  | 701fdc33bb | ||
|  | 719d4c2b05 | ||
|  | e74db2ad83 | ||
|  | 9c36a8a13b | ||
|  | 94b8b655cd | ||
|  | 8019e386bc | 
							
								
								
									
										6
									
								
								.env
									
									
									
									
									
								
							
							
						
						
									
										6
									
								
								.env
									
									
									
									
									
								
							| @@ -1,6 +1,6 @@ | ||||
| WAZUH_VERSION=4.9.2 | ||||
| WAZUH_IMAGE_VERSION=4.9.2 | ||||
| WAZUH_VERSION=4.10.2 | ||||
| WAZUH_IMAGE_VERSION=4.10.2 | ||||
| WAZUH_TAG_REVISION=1 | ||||
| FILEBEAT_TEMPLATE_BRANCH=4.9.2 | ||||
| FILEBEAT_TEMPLATE_BRANCH=4.10.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.9.2 | ||||
|     - 4.10.2 | ||||
| port: | ||||
|   tcp:1514: | ||||
|     listening: true | ||||
|   | ||||
							
								
								
									
										167
									
								
								.github/workflows/Procedure_push_docker_images.yml
									
									
									
									
										vendored
									
									
										Normal file
									
								
							
							
						
						
									
										167
									
								
								.github/workflows/Procedure_push_docker_images.yml
									
									
									
									
										vendored
									
									
										Normal file
									
								
							| @@ -0,0 +1,167 @@ | ||||
| run-name: Launch Push Docker Images - ${{ inputs.id }} | ||||
| name: Push Docker Images | ||||
|  | ||||
| on: | ||||
|   workflow_dispatch: | ||||
|     inputs: | ||||
|       image_tag: | ||||
|         description: 'Docker image tag' | ||||
|         default: '4.10.2' | ||||
|         required: true | ||||
|       docker_reference: | ||||
|         description: 'wazuh-docker reference' | ||||
|         default: 'v4.10.2' | ||||
|         required: false | ||||
|       products: | ||||
|         description: 'Comma-separated list of the image names to build and push' | ||||
|         default: 'wazuh-manager,wazuh-dashboard,wazuh-indexer' | ||||
|         required: true | ||||
|       filebeat_module_version: | ||||
|         description: 'Filebeat module version' | ||||
|         default: '0.4' | ||||
|         required: true | ||||
|       revision: | ||||
|         description: 'Package revision' | ||||
|         default: '1' | ||||
|         required: true | ||||
|       push_images: | ||||
|         description: 'Push images' | ||||
|         type: boolean | ||||
|         default: true | ||||
|         required: true | ||||
|       id: | ||||
|         description: "ID used to identify the workflow uniquely." | ||||
|         type: string | ||||
|         required: false | ||||
|       dev: | ||||
|         description: "Add tag suffix '-dev' to the image tag ?" | ||||
|         type: boolean | ||||
|         default: true | ||||
|         required: false | ||||
|   workflow_call: | ||||
|     inputs: | ||||
|       image_tag: | ||||
|         description: 'Docker image tag' | ||||
|         default: '4.10.2' | ||||
|         required: true | ||||
|         type: string | ||||
|       docker_reference: | ||||
|         description: 'wazuh-docker reference' | ||||
|         default: 'v4.10.2' | ||||
|         required: false | ||||
|         type: string | ||||
|       products: | ||||
|         description: 'Comma-separated list of the image names to build and push' | ||||
|         default: 'wazuh-manager,wazuh-dashboard,wazuh-indexer' | ||||
|         required: true | ||||
|         type: string | ||||
|       filebeat_module_version: | ||||
|         description: 'Filebeat module version' | ||||
|         default: '0.4' | ||||
|         required: true | ||||
|         type: string | ||||
|       revision: | ||||
|         description: 'Package revision' | ||||
|         default: '1' | ||||
|         required: true | ||||
|         type: string | ||||
|       push_images: | ||||
|         description: 'Push images' | ||||
|         type: boolean | ||||
|         default: true | ||||
|         required: true | ||||
|       id: | ||||
|         description: "ID used to identify the workflow uniquely." | ||||
|         type: string | ||||
|         required: false | ||||
|       dev: | ||||
|         description: "Add tag suffix '-dev' to the image tag ?" | ||||
|         type: boolean | ||||
|         default: false | ||||
|         required: false | ||||
|  | ||||
| jobs: | ||||
|   build-and-push: | ||||
|     runs-on: ubuntu-latest | ||||
|  | ||||
|     steps: | ||||
|     - name: Print inputs | ||||
|       run: | | ||||
|         echo "---------------------------------------------" | ||||
|         echo "Running Procedure_push_docker_images workflow" | ||||
|         echo "---------------------------------------------" | ||||
|         echo "* BRANCH: ${{ github.ref }}" | ||||
|         echo "* COMMIT: ${{ github.sha }}" | ||||
|         echo "---------------------------------------------" | ||||
|         echo "Inputs provided:" | ||||
|         echo "---------------------------------------------" | ||||
|         echo "* id: ${{ inputs.id }}" | ||||
|         echo "* image_tag: ${{ inputs.image_tag }}" | ||||
|         echo "* docker_reference: ${{ inputs.docker_reference }}" | ||||
|         echo "* products: ${{ inputs.products }}" | ||||
|         echo "* filebeat_module_version: ${{ inputs.filebeat_module_version }}" | ||||
|         echo "* revision: ${{ inputs.revision }}" | ||||
|         echo "* push_images: ${{ inputs.push_images }}" | ||||
|         echo "* dev: ${{ inputs.dev }}" | ||||
|         echo "---------------------------------------------" | ||||
|  | ||||
|     - name: Checkout repository | ||||
|       uses: actions/checkout@v4 | ||||
|       with: | ||||
|         ref: ${{ inputs.docker_reference }} | ||||
|  | ||||
|     - name: Log in to Docker Hub | ||||
|       uses: docker/login-action@v3 | ||||
|       with: | ||||
|         username: ${{ secrets.DOCKERHUB_USERNAME }} | ||||
|         password: ${{ secrets.DOCKERHUB_PASSWORD }} | ||||
|  | ||||
|     - name: Install Docker Compose | ||||
|       run: | | ||||
|         sudo apt-get update | ||||
|         sudo apt-get install -y docker-compose | ||||
|         echo "Installed Docker Compose version: $(docker-compose --version)" | ||||
|  | ||||
|     - name: Build Wazuh images | ||||
|       run: | | ||||
|         IMAGE_TAG=${{ inputs.image_tag }} | ||||
|         FILEBEAT_MODULE_VERSION=${{ inputs.filebeat_module_version }} | ||||
|         REVISION=${{ inputs.revision }} | ||||
|  | ||||
|         if [[ "$IMAGE_TAG" == *"-"* ]]; then | ||||
|           IFS='-' read -r -a tokens <<< "$IMAGE_TAG" | ||||
|           if [ -z "${tokens[1]}" ]; then | ||||
|             echo "Invalid image tag: $IMAGE_TAG" | ||||
|             exit 1 | ||||
|           fi | ||||
|           DEV_STAGE=${tokens[1]} | ||||
|           WAZUH_VER=${tokens[0]} | ||||
|           ./build-docker-images/build-images.sh -v $WAZUH_VER -r $REVISION -d $DEV_STAGE -f $FILEBEAT_MODULE_VERSION | ||||
|         else | ||||
|           ./build-docker-images/build-images.sh -v $IMAGE_TAG -r $REVISION -f $FILEBEAT_MODULE_VERSION | ||||
|         fi | ||||
|  | ||||
|         # Save .env file (generated by build-images.sh) contents to $GITHUB_ENV | ||||
|         ENV_FILE_PATH=".env" | ||||
|  | ||||
|         if [ -f $ENV_FILE_PATH ]; then | ||||
|           while IFS= read -r line || [ -n "$line" ]; do | ||||
|             echo "$line" >> $GITHUB_ENV | ||||
|           done < $ENV_FILE_PATH | ||||
|         else | ||||
|           echo "The environment file $ENV_FILE_PATH does not exist!" | ||||
|           exit 1 | ||||
|         fi | ||||
|  | ||||
|     - name: Tag and Push Wazuh images | ||||
|       if: ${{ inputs.push_images }} | ||||
|       run: | | ||||
|         IMAGE_TAG="${{ inputs.image_tag }}$( [ "${{ inputs.dev }}" == "true" ] && echo '-dev' || true )" | ||||
|         IMAGE_NAMES=${{ inputs.products }} | ||||
|         IFS=',' read -r -a images <<< "$IMAGE_NAMES" | ||||
|         for image in "${images[@]}"; do | ||||
|           echo "Tagging and pushing wazuh/$image:${WAZUH_VERSION} to wazuh/$image:$IMAGE_TAG" | ||||
|           docker tag wazuh/$image:${WAZUH_VERSION} wazuh/$image:$IMAGE_TAG | ||||
|           echo "Pushing wazuh/$image:$IMAGE_TAG ..." | ||||
|           docker push wazuh/$image:$IMAGE_TAG | ||||
|         done | ||||
							
								
								
									
										24
									
								
								.github/workflows/push.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										24
									
								
								.github/workflows/push.yml
									
									
									
									
										vendored
									
									
								
							| @@ -8,7 +8,7 @@ jobs: | ||||
|     steps: | ||||
|  | ||||
|     - name: Check out code | ||||
|       uses: actions/checkout@v3 | ||||
|       uses: actions/checkout@v4 | ||||
|  | ||||
|     - name: Install docker-compose | ||||
|       run: | | ||||
| @@ -29,21 +29,21 @@ jobs: | ||||
|         docker save wazuh/wazuh-dashboard:${{env.WAZUH_IMAGE_VERSION}} -o /home/runner/work/wazuh-docker/wazuh-docker/docker-images/wazuh-dashboard.tar | ||||
|  | ||||
|     - name: Temporarily save Wazuh manager Docker image | ||||
|       uses: actions/upload-artifact@v3 | ||||
|       uses: actions/upload-artifact@v4 | ||||
|       with: | ||||
|         name: docker-artifact-manager | ||||
|         path: /home/runner/work/wazuh-docker/wazuh-docker/docker-images/wazuh-manager.tar | ||||
|         retention-days: 1 | ||||
|  | ||||
|     - name: Temporarily save Wazuh indexer Docker image | ||||
|       uses: actions/upload-artifact@v3 | ||||
|       uses: actions/upload-artifact@v4 | ||||
|       with: | ||||
|         name: docker-artifact-indexer | ||||
|         path: /home/runner/work/wazuh-docker/wazuh-docker/docker-images/wazuh-indexer.tar | ||||
|         retention-days: 1 | ||||
|  | ||||
|     - name: Temporarily save Wazuh dashboard Docker image | ||||
|       uses: actions/upload-artifact@v3 | ||||
|       uses: actions/upload-artifact@v4 | ||||
|       with: | ||||
|         name: docker-artifact-dashboard | ||||
|         path: /home/runner/work/wazuh-docker/wazuh-docker/docker-images/wazuh-dashboard.tar | ||||
| @@ -66,7 +66,7 @@ jobs: | ||||
|     steps: | ||||
|  | ||||
|     - name: Check out code | ||||
|       uses: actions/checkout@v3 | ||||
|       uses: actions/checkout@v4 | ||||
|  | ||||
|     - name: Install docker-compose | ||||
|       run: | | ||||
| @@ -77,17 +77,17 @@ jobs: | ||||
|       run: cat .env > $GITHUB_ENV | ||||
|  | ||||
|     - name: Retrieve saved Wazuh indexer Docker image | ||||
|       uses: actions/download-artifact@v3 | ||||
|       uses: actions/download-artifact@v4 | ||||
|       with: | ||||
|         name: docker-artifact-indexer | ||||
|  | ||||
|     - name: Retrieve saved Wazuh manager Docker image | ||||
|       uses: actions/download-artifact@v3 | ||||
|       uses: actions/download-artifact@v4 | ||||
|       with: | ||||
|         name: docker-artifact-manager | ||||
|  | ||||
|     - name: Retrieve saved Wazuh dashboard Docker image | ||||
|       uses: actions/download-artifact@v3 | ||||
|       uses: actions/download-artifact@v4 | ||||
|       with: | ||||
|         name: docker-artifact-dashboard | ||||
|  | ||||
| @@ -194,7 +194,7 @@ jobs: | ||||
|     steps: | ||||
|  | ||||
|     - name: Check out code | ||||
|       uses: actions/checkout@v3 | ||||
|       uses: actions/checkout@v4 | ||||
|  | ||||
|     - name: Install docker-compose | ||||
|       run: | | ||||
| @@ -213,17 +213,17 @@ jobs: | ||||
|         df -h | ||||
|  | ||||
|     - name: Retrieve saved Wazuh dashboard Docker image | ||||
|       uses: actions/download-artifact@v3 | ||||
|       uses: actions/download-artifact@v4 | ||||
|       with: | ||||
|         name: docker-artifact-dashboard | ||||
|  | ||||
|     - name: Retrieve saved Wazuh manager Docker image | ||||
|       uses: actions/download-artifact@v3 | ||||
|       uses: actions/download-artifact@v4 | ||||
|       with: | ||||
|         name: docker-artifact-manager | ||||
|  | ||||
|     - name: Retrieve saved Wazuh indexer Docker image | ||||
|       uses: actions/download-artifact@v3 | ||||
|       uses: actions/download-artifact@v4 | ||||
|       with: | ||||
|         name: docker-artifact-indexer | ||||
|  | ||||
|   | ||||
							
								
								
									
										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@v3 | ||||
|         uses: actions/checkout@v4 | ||||
|  | ||||
|       - 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@v3 | ||||
|         uses: actions/checkout@v4 | ||||
|  | ||||
|       - 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@v3 | ||||
|         uses: actions/checkout@v4 | ||||
|  | ||||
|       - name: Installing dependencies | ||||
|         run: | | ||||
|   | ||||
							
								
								
									
										57
									
								
								CHANGELOG.md
									
									
									
									
									
								
							
							
						
						
									
										57
									
								
								CHANGELOG.md
									
									
									
									
									
								
							| @@ -1,6 +1,63 @@ | ||||
| # Change Log | ||||
| All notable changes to this project will be documented in this file. | ||||
|  | ||||
| ## [4.10.2] | ||||
|  | ||||
| ### Added | ||||
|  | ||||
| - None | ||||
|  | ||||
| ### Changed | ||||
|  | ||||
| - None | ||||
|  | ||||
| ### Fixed | ||||
|  | ||||
| - Updated docker/login-action module ([#1837](https://github.com/wazuh/wazuh-docker/pull/1837)) | ||||
|  | ||||
| ### Deleted | ||||
|  | ||||
| - None | ||||
|  | ||||
| ## [4.10.1] | ||||
|  | ||||
| ### Added | ||||
|  | ||||
| - None | ||||
|  | ||||
| ### Changed | ||||
|  | ||||
| - None | ||||
|  | ||||
| ### Fixed | ||||
|  | ||||
| - None | ||||
|  | ||||
| ### Deleted | ||||
|  | ||||
| - None | ||||
|  | ||||
| ## [4.10.0] | ||||
|  | ||||
| ### Added | ||||
|  | ||||
| - Improve the push docker images workflow ([#1551](https://github.com/wazuh/wazuh-docker/pull/1551)) | ||||
| - Update the Procedure push docker images workflow file ([#1524](https://github.com/wazuh/wazuh-docker/pull/1524)) | ||||
| - Add the push_docker_images procedure workflow file ([#1518](https://github.com/wazuh/wazuh-docker/pull/1518)) | ||||
|  | ||||
| ### Changed | ||||
|  | ||||
| - None | ||||
|  | ||||
| ### Fixed | ||||
|  | ||||
| - Add unset capabilities. ([#1619](https://github.com/wazuh/wazuh-docker/pull/1619)) | ||||
| - Removed references to module enabling because they are now enabled by default. ([#1416](https://github.com/wazuh/wazuh-docker/pull/1416)) | ||||
|  | ||||
| ### Deleted | ||||
|  | ||||
| - None | ||||
|  | ||||
| ## [4.9.2] | ||||
|  | ||||
| ### Added | ||||
|   | ||||
							
								
								
									
										17
									
								
								README.md
									
									
									
									
									
								
							
							
						
						
									
										17
									
								
								README.md
									
									
									
									
									
								
							| @@ -58,20 +58,6 @@ CHECKS_TEMPLATE=true            # step once the Wazuh app starts. Values must be | ||||
| CHECKS_API=true | ||||
| CHECKS_SETUP=true | ||||
|  | ||||
| EXTENSIONS_PCI=true             # Enable PCI Extension | ||||
| EXTENSIONS_GDPR=true            # Enable GDPR Extension | ||||
| EXTENSIONS_HIPAA=true           # Enable HIPAA Extension | ||||
| EXTENSIONS_NIST=true            # Enable NIST Extension | ||||
| EXTENSIONS_TSC=true             # Enable TSC Extension | ||||
| EXTENSIONS_AUDIT=true           # Enable Audit Extension | ||||
| EXTENSIONS_OSCAP=false          # Enable OpenSCAP Extension | ||||
| EXTENSIONS_CISCAT=false         # Enable CISCAT Extension | ||||
| EXTENSIONS_AWS=false            # Enable AWS Extension | ||||
| EXTENSIONS_GCP=false            # Enable GCP Extension | ||||
| EXTENSIONS_VIRUSTOTAL=false     # Enable Virustotal Extension | ||||
| EXTENSIONS_OSQUERY=false        # Enable OSQuery Extension | ||||
| EXTENSIONS_DOCKER=false         # Enable Docker Extension | ||||
|  | ||||
| APP_TIMEOUT=20000               # Defines maximum timeout to be used on the Wazuh app requests | ||||
|  | ||||
| API_SELECTOR=true               Defines if the user is allowed to change the selected API directly from the Wazuh app top menu | ||||
| @@ -192,6 +178,9 @@ WAZUH_MONITORING_REPLICAS=0         ## | ||||
|  | ||||
| | Wazuh version | ODFE    | XPACK  | | ||||
| |---------------|---------|--------| | ||||
| | v4.10.2       |         |        | | ||||
| | v4.10.1       |         |        | | ||||
| | v4.10.0       |         |        | | ||||
| | v4.9.2        |         |        | | ||||
| | v4.9.1        |         |        | | ||||
| | v4.9.0        |         |        | | ||||
|   | ||||
							
								
								
									
										4
									
								
								VERSION
									
									
									
									
									
								
							
							
						
						
									
										4
									
								
								VERSION
									
									
									
									
									
								
							| @@ -1,2 +1,2 @@ | ||||
| WAZUH-DOCKER_VERSION="4.9.2" | ||||
| REVISION="40921" | ||||
| WAZUH-DOCKER_VERSION="4.10.2" | ||||
| REVISION="41021" | ||||
|   | ||||
| @@ -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.9.2 | ||||
| $ build-docker-images/build-images.sh -v 4.10.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.9.2. | ||||
|     -v, --version <ver>          [Optional] Set the Wazuh version should be builded. By default, 4.10.2. | ||||
|     -h, --help                   Show this help. | ||||
|  | ||||
| ``` | ||||
| @@ -1,4 +1,4 @@ | ||||
| WAZUH_IMAGE_VERSION=4.9.2 | ||||
| WAZUH_IMAGE_VERSION=4.10.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.9.2" | ||||
| WAZUH_IMAGE_VERSION="4.10.2" | ||||
| WAZUH_TAG_REVISION="1" | ||||
| WAZUH_DEV_STAGE="" | ||||
| FILEBEAT_MODULE_VERSION="0.4" | ||||
| @@ -70,7 +70,7 @@ build() { | ||||
|     echo WAZUH_FILEBEAT_MODULE=$WAZUH_FILEBEAT_MODULE >> .env | ||||
|     echo WAZUH_UI_REVISION=$WAZUH_UI_REVISION >> .env | ||||
|  | ||||
|     docker-compose -f build-docker-images/build-images.yml --env-file .env build --no-cache | ||||
|     docker-compose -f build-docker-images/build-images.yml --env-file .env build --no-cache || clean 1 | ||||
|  | ||||
|     return 0 | ||||
| } | ||||
|   | ||||
| @@ -21,6 +21,8 @@ RUN mkdir -p $INSTALL_DIR/data/wazuh && chmod -R 775 $INSTALL_DIR/data/wazuh | ||||
| RUN mkdir -p $INSTALL_DIR/data/wazuh/config && chmod -R 775 $INSTALL_DIR/data/wazuh/config | ||||
| RUN mkdir -p $INSTALL_DIR/data/wazuh/logs && chmod -R 775 $INSTALL_DIR/data/wazuh/logs | ||||
| COPY config/wazuh.yml $INSTALL_DIR/data/wazuh/config/ | ||||
| RUN setcap 'cap_net_bind_service=-ep' /usr/share/wazuh-dashboard/node/bin/node | ||||
| RUN setcap 'cap_net_bind_service=-ep' /usr/share/wazuh-dashboard/node/fallback/bin/node | ||||
|  | ||||
| # Generate certificates | ||||
| COPY config/config.sh . | ||||
| @@ -48,21 +50,6 @@ ENV PATTERN="" \ | ||||
|     CHECKS_TEMPLATE="" \ | ||||
|     CHECKS_API="" \ | ||||
|     CHECKS_SETUP="" \ | ||||
|     EXTENSIONS_PCI="" \ | ||||
|     EXTENSIONS_GDPR="" \ | ||||
|     EXTENSIONS_HIPAA="" \ | ||||
|     EXTENSIONS_NIST="" \ | ||||
|     EXTENSIONS_TSC="" \ | ||||
|     EXTENSIONS_AUDIT="" \ | ||||
|     EXTENSIONS_OSCAP="" \ | ||||
|     EXTENSIONS_CISCAT="" \ | ||||
|     EXTENSIONS_AWS="" \ | ||||
|     EXTENSIONS_GCP="" \ | ||||
|     EXTENSIONS_GITHUB=""\ | ||||
|     EXTENSIONS_OFFICE=""\ | ||||
|     EXTENSIONS_VIRUSTOTAL="" \ | ||||
|     EXTENSIONS_OSQUERY="" \ | ||||
|     EXTENSIONS_DOCKER="" \ | ||||
|     APP_TIMEOUT="" \ | ||||
|     API_SELECTOR="" \ | ||||
|     IP_SELECTOR="" \ | ||||
|   | ||||
| @@ -9,8 +9,8 @@ export CONFIG_DIR=${INSTALLATION_DIR}/config | ||||
|  | ||||
| ## Variables | ||||
| CERT_TOOL=wazuh-certs-tool.sh | ||||
| PACKAGES_URL=https://packages.wazuh.com/4.9/ | ||||
| PACKAGES_DEV_URL=https://packages-dev.wazuh.com/4.9/ | ||||
| PACKAGES_URL=https://packages.wazuh.com/4.10/ | ||||
| PACKAGES_DEV_URL=https://packages-dev.wazuh.com/4.10/ | ||||
|  | ||||
| ## 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}') | ||||
|   | ||||
| @@ -15,21 +15,6 @@ declare -A CONFIG_MAP=( | ||||
|   [checks.template]=$CHECKS_TEMPLATE | ||||
|   [checks.api]=$CHECKS_API | ||||
|   [checks.setup]=$CHECKS_SETUP | ||||
|   [extensions.pci]=$EXTENSIONS_PCI | ||||
|   [extensions.gdpr]=$EXTENSIONS_GDPR | ||||
|   [extensions.hipaa]=$EXTENSIONS_HIPAA | ||||
|   [extensions.nist]=$EXTENSIONS_NIST | ||||
|   [extensions.tsc]=$EXTENSIONS_TSC | ||||
|   [extensions.audit]=$EXTENSIONS_AUDIT | ||||
|   [extensions.oscap]=$EXTENSIONS_OSCAP | ||||
|   [extensions.ciscat]=$EXTENSIONS_CISCAT | ||||
|   [extensions.aws]=$EXTENSIONS_AWS | ||||
|   [extensions.gcp]=$EXTENSIONS_GCP | ||||
|   [extensions.github]=$EXTENSIONS_GITHUB | ||||
|   [extensions.office]=$EXTENSIONS_OFFICE | ||||
|   [extensions.virustotal]=$EXTENSIONS_VIRUSTOTAL | ||||
|   [extensions.osquery]=$EXTENSIONS_OSQUERY | ||||
|   [extensions.docker]=$EXTENSIONS_DOCKER | ||||
|   [timeout]=$APP_TIMEOUT | ||||
|   [api.selector]=$API_SELECTOR | ||||
|   [ip.selector]=$IP_SELECTOR | ||||
|   | ||||
| @@ -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.9/ | ||||
| PACKAGES_DEV_URL=https://packages-dev.wazuh.com/4.9/ | ||||
| PACKAGES_URL=https://packages.wazuh.com/4.10/ | ||||
| PACKAGES_DEV_URL=https://packages-dev.wazuh.com/4.10/ | ||||
|  | ||||
| ## 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}') | ||||
|   | ||||
| @@ -82,6 +82,11 @@ PERMANENT_DATA_EXCP[((i++))]="/var/ossec/wodles/azure/azure-logs.py" | ||||
| PERMANENT_DATA_EXCP[((i++))]="/var/ossec/wodles/azure/db/orm.py" | ||||
| PERMANENT_DATA_EXCP[((i++))]="/var/ossec/wodles/azure/db/utils.py" | ||||
| PERMANENT_DATA_EXCP[((i++))]="/var/ossec/wodles/azure/db/__init__.py" | ||||
| PERMANENT_DATA_EXCP[((i++))]="/var/ossec/wodles/azure/azure_utils.py" | ||||
| PERMANENT_DATA_EXCP[((i++))]="/var/ossec/wodles/azure/azure_services/__init__.py" | ||||
| PERMANENT_DATA_EXCP[((i++))]="/var/ossec/wodles/azure/azure_services/analytics.py" | ||||
| PERMANENT_DATA_EXCP[((i++))]="/var/ossec/wodles/azure/azure_services/graph.py" | ||||
| PERMANENT_DATA_EXCP[((i++))]="/var/ossec/wodles/azure/azure_services/storage.py" | ||||
| PERMANENT_DATA_EXCP[((i++))]="/var/ossec/wodles/docker/DockerListener" | ||||
| PERMANENT_DATA_EXCP[((i++))]="/var/ossec/wodles/docker/DockerListener.py" | ||||
| PERMANENT_DATA_EXCP[((i++))]="/var/ossec/wodles/gcloud/gcloud" | ||||
| @@ -89,6 +94,9 @@ PERMANENT_DATA_EXCP[((i++))]="/var/ossec/wodles/gcloud/gcloud.py" | ||||
| PERMANENT_DATA_EXCP[((i++))]="/var/ossec/wodles/gcloud/integration.py" | ||||
| PERMANENT_DATA_EXCP[((i++))]="/var/ossec/wodles/gcloud/tools.py" | ||||
| 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" | ||||
| 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.9/ | ||||
| PACKAGES_DEV_URL=https://packages-dev.wazuh.com/4.9/ | ||||
| PACKAGES_URL=https://packages.wazuh.com/4.10/ | ||||
| PACKAGES_DEV_URL=https://packages-dev.wazuh.com/4.10/ | ||||
|  | ||||
| ## 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.9.2 | ||||
|     image: wazuh/wazuh-manager:4.10.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.9.2 | ||||
|     image: wazuh/wazuh-manager:4.10.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.9.2 | ||||
|     image: wazuh/wazuh-indexer:4.10.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.9.2 | ||||
|     image: wazuh/wazuh-indexer:4.10.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.9.2 | ||||
|     image: wazuh/wazuh-indexer:4.10.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.9.2 | ||||
|     image: wazuh/wazuh-dashboard:4.10.2 | ||||
|     hostname: wazuh.dashboard | ||||
|     restart: always | ||||
|     ports: | ||||
|   | ||||
| @@ -3,7 +3,7 @@ version: '3.7' | ||||
|  | ||||
| services: | ||||
|   wazuh.manager: | ||||
|     image: wazuh/wazuh-manager:4.9.2 | ||||
|     image: wazuh/wazuh-manager:4.10.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.9.2 | ||||
|     image: wazuh/wazuh-indexer:4.10.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.9.2 | ||||
|     image: wazuh/wazuh-dashboard:4.10.2 | ||||
|     hostname: wazuh.dashboard | ||||
|     restart: always | ||||
|     ports: | ||||
|   | ||||
		Reference in New Issue
	
	Block a user