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: use binary criu release; update some ci deps #2691

Merged
merged 3 commits into from
Dec 4, 2020

Conversation

kolyshkin
Copy link
Contributor

@kolyshkin kolyshkin commented Nov 27, 2020

As suggested by @adrianreber in checkpoint-restore/criu#1293 (comment)

This "reverts" commit 9ff7b82. We use the repo provided and maintained
by the CRIU team instead of compiling it from source.

While at it,

  1. Don't install packages that were solely needed to compile CRIU.
  2. Combine all apt-related stuff into a single step, so we don't
    download and then remove apt metadata 3 times.
  3. bats: update to 1.2.1
  4. umoci: update to 0.4.6

TODO:
* have CRIU make a Debian repo
* remove packages that are needed to build CRIU

Dockerfile Outdated Show resolved Hide resolved
@adrianreber
Copy link
Contributor

Looks good. The CentOS 7 and Fedora 33 tests were already using my packages and now also the Ubuntu based test. I had a look at the test logs and CRIU is actually installed in all cases from a package and the checkpoint/restore tests are being run everywhere.

mrunalp
mrunalp previously approved these changes Nov 30, 2020
@kolyshkin kolyshkin marked this pull request as draft November 30, 2020 03:43
@kolyshkin kolyshkin force-pushed the dont-compile-criu branch 3 times, most recently from 1792a0e to 8f1d0f1 Compare December 2, 2020 00:45
@kolyshkin kolyshkin marked this pull request as ready for review December 2, 2020 01:11
Dockerfile Outdated Show resolved Hide resolved
This "reverts" commit 9ff7b82. We use the repo provided and maintained
by the CRIU team instead of compiling it from source.

While at it,

1. Don't install packages that were solely needed to compile CRIU.

2. Combine all apt-related stuff into a single step, so we don't
   download and then remove apt metadata 3 times.

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
@kolyshkin kolyshkin changed the title Dockerfile: use binary criu release Dockerfile: use binary criu release; update some ci deps Dec 3, 2020
@mrunalp mrunalp merged commit 166068a into opencontainers:master Dec 4, 2020
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.

5 participants