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

Dockerfile fix for 20.04 #463

Merged
merged 2 commits into from
Nov 17, 2020

Conversation

g2flyer
Copy link
Contributor

@g2flyer g2flyer commented Nov 12, 2020

Small fix to dockerfile so they work also with 20.04.
DOCKER_BUILD_OPTS="--build-arg SGX=2.12 --build-arg UBUNTU_VERSION=20.04 --build-arg UBUNTU_NAME=focal" make -C utils/docker
should build all images from utils/docker successfully based on 20.04

See comment on issue #411 for some context.

Signed-off-by: Michael Steiner <[email protected]>
@mbrandenburger
Copy link
Contributor

Uh this is nice! Though, we may run into similar issues as @bvavala pointed out in #462 that switching between master and flow development may be cumbersome.

@g2flyer
Copy link
Contributor Author

g2flyer commented Nov 12, 2020

Though, we may run into similar issues as @bvavala pointed out in #462 that switching between master and flow development may be cumbersome.

This should not affect switching between branches (at least not more than what you have to inevitably do, i.e., rebuild). It also should be backwards compatible if need would arise to backport. In any case, master is effectively frozen before renitegrating flow-refactoring so there are not really any reason to go back and forth? That said, this PR is obviously not urgent, it was just an artifact of stumbling yesterday over the SGX version update and the related apt update break and then multi-tasking during various meetings on assessing the impact of it...

Copy link
Contributor

@mbrandenburger mbrandenburger left a comment

Choose a reason for hiding this comment

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

LGTM! Thanks!

@g2flyer g2flyer merged commit a8e9a2a into hyperledger:flow-refactoring Nov 17, 2020
@g2flyer g2flyer deleted the msteiner.ubuntu-20.04 branch November 17, 2020 21:32
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.

2 participants