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

Upgrade docker images from 20.04 to 22.04 #465

Merged
merged 2 commits into from
Jan 31, 2024

Conversation

g2flyer
Copy link
Contributor

@g2flyer g2flyer commented Jan 25, 2024

Title mostly says it all. Main trigger was that client docker image had too old a cmake ("thanks" to a 1/16 change) to build contracts in pdo-contracts. That said, 20.04 of course is also a bit dated and EOL if in a year.

Tested by running the usual make test here and by mounting pdo-contracts into a client container and then run make test in it (which admittedly initially failed in the inference tests but that was due to the guardian requiring an apt install libgl1 libcudart11.0 to work properly! After running that make test also worked for pdo-contracts => Q: should we add these dependencies also to pdo_client.dockerfile?)

@cmickeyb
Copy link
Contributor

have you tested with host install mode as well?

@g2flyer
Copy link
Contributor Author

g2flyer commented Jan 29, 2024

have you tested with host install mode as well?

Nope, i just wanted to make docker images work with pdo-contract which now (implicitly) requires 22.04. Hence i've also not updated any docu that 22.04 is now the default (which i think Prakash has something against :-)

Copy link
Contributor

@prakashngit prakashngit left a comment

Choose a reason for hiding this comment

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

Are we dropping docker support for 20.04? If this PR is about adding support for 22.04 in addition to 20.04, I am in favor. I am not in favor of dropping docker support for 20.04, given that PDO itself is supported for 20.04 ONLY as of now. Until we officially move PDO to 22.04, we should retain docker support for 20.04. If docker fails in 20.04 due to a recent commit, IMHO we should revert those commits.

@g2flyer
Copy link
Contributor Author

g2flyer commented Jan 29, 2024

re we dropping docker support for 20.04? If this PR is about adding support for 22.04 in addition to 20.04, I am in favor. I am not in favor of dropping docker support for 20.04, given that PDO itself is supported for 20.04 ONLY as of now.

You still will be able to build docker with ubuntu 20.04, it just wouldn't be the default anymore. You just have to specify UBUNTU_VERSION and UBUNTU_NAME docker build variables, e.g., via adding to make.loc a line with export DOCKER_BUILDARGS=--build-arg UBUNTU_VERSION=20.04 --build-arg UBUNTU_NAME=focal. (Note: ubu 20.04 does have a python3 package (but 22.04 no python!), so the package change is fine and the sdk is the same for 20.04 and newer, so we don't need that conditional anymore ...)

@g2flyer g2flyer force-pushed the msteiner.ubuntu-22.04 branch from 0c7681d to ea61570 Compare January 30, 2024 00:11
Copy link
Contributor

@prakashngit prakashngit left a comment

Choose a reason for hiding this comment

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

Thank you. Tested using 'make test' on a fresh VM. Haven't tested the containers against examples from the contract repo. One very minor comment is that on the https://github.com/hyperledger-labs/private-data-objects/blob/main/docs/docker.md doc, it would be good to say that one needs to have make installed as well to create the docker images. Not sure if the version matters. Thanks!

@cmickeyb cmickeyb merged commit 6f74038 into hyperledger-labs:main Jan 31, 2024
4 checks passed
@g2flyer g2flyer deleted the msteiner.ubuntu-22.04 branch January 31, 2024 19:25
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.

3 participants