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

Update builder image and fix CI target for bandit #5749

Merged
merged 4 commits into from
Jan 26, 2021

Conversation

emkll
Copy link
Contributor

@emkll emkll commented Jan 26, 2021

Status

Ready for review

Description of Changes

Fixes #5748
Fixes #5747
Towards #5689

Changes proposed in this pull request:

Testing

  • CI is passing (including deb-tests for Xenial and Focal containers)

Deployment

Dev-only

Builder image needed updates
emkll added 3 commits January 26, 2021 10:08
The sid package was introducing broken dependencies.
Image needed updates
@emkll emkll force-pushed the update-builder-20210126 branch from 1b4eba0 to 355cee0 Compare January 26, 2021 15:09
@@ -296,13 +296,13 @@ jobs:
name: Check Python dependencies for CVEs
command: |
fromtag=$(docker images |grep securedrop-test-xenial-py3 |head -n1 |awk '{print $2}')
DOCKER_BUILD_ARGUMENTS="--cache-from securedrop-test-xenial-py3:${fromtag:-latest}" securedrop/bin/dev-shell bash -c "sudo pip3 install -q --upgrade safety && make -C .. safety"
DOCKER_BUILD_ARGUMENTS="--cache-from securedrop-test-xenial-py3:${fromtag:-latest}" securedrop/bin/dev-shell bash -c "pip3 install -U -q --upgrade safety && make -C .. safety"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

-U is redundant with --upgrade already in the task list. Seems like it's lack of sudo privileges that would have resolved #5748. Not a blocker, since today is release day and CI runs take a long time, just pointing it out in case I'm missing something.

@conorsch conorsch self-requested a review January 26, 2021 16:31
Copy link
Contributor

@conorsch conorsch left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

CI is passing! Thanks, @emkll

@conorsch conorsch merged commit 0b7f93a into develop Jan 26, 2021
@emkll emkll deleted the update-builder-20210126 branch January 26, 2021 18:04
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

static-analysis-and-no-known-cves ci target is failing Build of focal-builder container is failing
2 participants