-
Notifications
You must be signed in to change notification settings - Fork 9
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Simplify and speed up the clamav build.
- Use govuk-ruby-builder for clamav. Simplifies the Dockerfile by eliminating boilerplate and speeds up the build by not having to install a bunch of stuff that already ships with govuk-ruby-builder. - Don't run the clamav Python testsuite; it's super slow and we're building from an official source tarball with a very common config, so it's not worth blowing up asset-manager's build time. - Add a crude but fast and farly effective smoke test for the two clam binaries that asset-manager needs. - Use the system Rust instead of faffing about installing it ourselves, since we don't antipcate any need to run on PowerPC any time soon. - Remove a bunch of unneeded Apt packages. - Remove some unneeded workarounds, e.g. install the clam binaries in the desired directory (which happens to be the default one from the CMakelists.txt anyway) rather than symlinking them afterwards. - Remove some (cough) [GPLed code] (cough) that was mistakenly copy-pasted into the Dockerfile of our MIT-licensed codebase here. [GPLed code]: https://www.github.com/Cisco-Talos/clamav-docker/blob/bf4c0c2/clamav/1.3/debian/Dockerfile Tested: built locally with Docker Desktop, copied some lightly-modified default configs into /usr/local/etc/*clam*.conf, successfully ran freshclam and scanned some files with clamdscan connecting to clamd via TCP on 127.0.0.1 (which is how we do it in prod).
- Loading branch information
Showing
1 changed file
with
39 additions
and
89 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters