Update to python 3.11, improve build times #26
Conversation
modules/Dockerfile
Outdated
| echo "pyeti" >> REQUIREMENTS | ||
| echo "greynoise" >> REQUIREMENTS | ||
| echo "git+https://github.com/abenassi/Google-Search-API" >> REQUIREMENTS | ||
| sed -i 's|apiosintds.*|git+https://github.com/davidonzo/apiosintDS\@misp|g' REQUIREMENTS |
There was a problem hiding this comment.
Looks like upstream's misp-module branch is now almost identical to the latest version AND pypi has an updated version.
In other words, we should probably use apiosintds==2.0.1 rather than the git repo.
There was a problem hiding this comment.
Ah yeah, looks like the old sed was broken by that change too.
There was a problem hiding this comment.
Oh, how come? (I can't see the error)
There was a problem hiding this comment.
It doesn't match anything anymore because it's not case-insensitive (though that's a good thing in this case)
There was a problem hiding this comment.
Fetching the latest apiosintDS package is somewhat of a pain because it depends on validators==0.20.0, while misp-modules wants 0.14.0. I cannot find release notes for 0.14.0 to 0.20.0 (only 0.21 and upwards), so no easy way of knowing whether there are breaking changes in the move.
However, I cannot find any instance of the package actually being used in misp-modules; this applies to pyeti and greynoise too, so I'm thinking it's fine to just blindly go for the version apios wants.
There was a problem hiding this comment.
Updated the source now and let it choose validators release
| cd /srv/misp-modules | ||
| echo "pyeti" >> REQUIREMENTS | ||
| echo "greynoise" >> REQUIREMENTS | ||
| echo "git+https://github.com/abenassi/Google-Search-API" >> REQUIREMENTS |
There was a problem hiding this comment.
My understanding is that there are no better forks. At some point we should check if that is still true.
|
A few nits left, and then we can merge. |
…e validators version
| echo "greynoise" >> REQUIREMENTS | ||
| echo "git+https://github.com/abenassi/Google-Search-API" >> REQUIREMENTS | ||
| sed -i 's|.*apiosintDS.*|apiosintDS==2.0.1|g' REQUIREMENTS | ||
| # let apiosintDS decide since misp-modules doesn't actually use this package anyway |
There was a problem hiding this comment.
Is that so? This however explains why the apiosintds repository has a misp branch with a different version for the validators dependency
There was a problem hiding this comment.
Yep. At least I can't find any trace of it being used by other modules
| RUN <<-EOF | ||
| git clone --depth 1 https://github.com/stricaud/faup.git /srv/faup | ||
| cd /srv/faup | ||
| git checkout ${LIBFAUP_COMMIT} |
There was a problem hiding this comment.
Shall we make this conditional iff ${LIBFAUP_COMMIT} is non-empty?
I am getting concerned about existing pipelines not setting it in the environment file
Image sizes: