Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Decouple AIP from Conda #42

Merged
merged 7 commits into from
Oct 27, 2024
Merged

Conversation

verovaleros
Copy link
Member

Description

Fixes #40

This PR implements the decoupling of AIP from Conda. The two major benefits are:

  1. Reduction of docker image size from 1.92GB to cca 370MB
  2. Remove the need for a separate Dockerfile for Mac M1s

The changes introduced are:

  • Switch from Conda to Python virtual environments (with updates to the entrypoint.sh)
  • Switch to multi-stage docker builds (removing dockerfile for m1)
  • Remove unused files (environment.yml, etc)
  • Leave only minimal requirements for production usage of AIP (blocklist generation)

How Has This Been Tested?

The new version of AIP has been tested with Zeek logs over several days with a variety of scenarios

  • Generating all files from zero
  • Generating files using the previous knowledge files
  • Generating blocklists on linux
  • Generating blocklists on mac m1

Checklist

  • My code follows the style guidelines of this project
  • I have performed a self-review of my code
  • I have commented my code, particularly in hard-to-understand areas
  • My changes generate no new warnings

@verovaleros verovaleros added the enhancement New feature or request label Oct 26, 2024
@verovaleros verovaleros added this to the v3.0.0 milestone Oct 26, 2024
@verovaleros
Copy link
Member Author

The etc/docker/README.md instructions do not need to be updated, steps are the same.

@verovaleros verovaleros self-assigned this Oct 27, 2024
@verovaleros verovaleros merged commit 067dcca into development Oct 27, 2024
2 checks passed
@verovaleros verovaleros deleted the 40-decouple-aip-from-conda branch October 27, 2024 14:45
@verovaleros verovaleros mentioned this pull request Oct 30, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement New feature or request
Projects
Status: Done
Development

Successfully merging this pull request may close these issues.

Investigate how to decouple AIP from Conda, and IF it brings improvements/flexibility
1 participant