mirror of
				https://github.com/optim-enterprises-bv/Mailu.git
				synced 2025-10-31 18:18:05 +00:00 
			
		
		
		
	Merge #3737
3737: Fix `clamav` path to allow for updates (backport #3735) r=mergify[bot] a=mergify[bot] ## What type of PR? Bug-fix, documentation ## What does this PR do? ### Related issue(s) Closes https://github.com/Mailu/Mailu/issues/3673 by placing ClamAV files under `mailu/clamav` instead of `mailu/filter/clamav`. Users will want to change their `docker-compose.yml` accordingly and remove `mailu/filter/clamav` after upgrade. I also updated ClamAV version while I was at it (I didn't find any breaking changes in the changelog), though [the latest release is not pushed to this image yet](https://github.com/Cisco-Talos/clamav/issues/1442). Also I'm wondering why is it using exact version instead of `:1` or `:1.4` for example, but decided to not change that to make it less controversial. ## Prerequisites This will not affect existing setups, though it would be nice to notify users somehow. <hr>This is an automatic backport of pull request #3735 done by [Mergify](https://mergify.com). Co-authored-by: Nazar Mokrynskyi <nazar@mokrynskyi.com>
This commit is contained in:
		| @@ -217,7 +217,7 @@ services: | ||||
|   # Optional services | ||||
|   {% if antivirus_enabled %} | ||||
|   antivirus: | ||||
|     image: clamav/clamav-debian:1.2.3-45 | ||||
|     image: clamav/clamav-debian:1.4 | ||||
|     restart: always | ||||
|     logging: | ||||
|       driver: journald | ||||
| @@ -226,7 +226,7 @@ services: | ||||
|     networks: | ||||
|       - clamav | ||||
|     volumes: | ||||
|       - "{{ root }}/filter/clamav:/var/lib/clamav" | ||||
|       - "{{ root }}/clamav:/var/lib/clamav" | ||||
|     healthcheck: | ||||
|       test: ["CMD-SHELL", "kill -0 `cat /tmp/clamd.pid` && kill -0 `cat /tmp/freshclam.pid`"] | ||||
|       interval: 10s | ||||
|   | ||||
| @@ -99,7 +99,7 @@ services: | ||||
|     networks: | ||||
|       - clamav | ||||
|     volumes: | ||||
|       - "/mailu/filter/clamav:/var/lib/clamav" | ||||
|       - "/mailu/clamav:/var/lib/clamav" | ||||
|     healthcheck: | ||||
|       test: ["CMD-SHELL", "kill -0 `cat /tmp/clamd.pid` && kill -0 `cat /tmp/freshclam.pid`"] | ||||
|       interval: 10s | ||||
|   | ||||
							
								
								
									
										7
									
								
								towncrier/newsfragments/3735.bugfix
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										7
									
								
								towncrier/newsfragments/3735.bugfix
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,7 @@ | ||||
| Place ClamAV files under `mailu/clamav` instead of `mailu/filter/clamav` such that they can be modified by ClamAV | ||||
| itself. | ||||
|  | ||||
| Users will want to change their `docker-compose.yml` accordingly and remove `mailu/filter/clamav` after upgrade. | ||||
|  | ||||
| Also ClamAV image tag increased to `1.4` instead of specific (older) release, users will need to update it manually as | ||||
| well and keep it updated over time. | ||||
		Reference in New Issue
	
	Block a user
	![150027869+bors-mailu[bot]@users.noreply.github.com](/assets/img/avatar_default.png) bors-mailu[bot]
					bors-mailu[bot]