Skip to content

Conversation

@Ace-Tang
Copy link
Contributor

update runc version to 1.0.0-rc4-2, support checkpoint/restore
function.

Signed-off-by: Ace-Tang [email protected]

Ⅰ. Describe what this PR did

update runc version to 1.0.0-rc4-2, support checkpoint/restore
function.

Signed-off-by: Ace-Tang [email protected]

Ⅱ. Does this pull request fix one issue?

Ⅲ. Why don't you add test cases (unit test/integration test)? (你真的觉得不需要加测试吗?)

no need.

Ⅳ. Describe how to verify it

Ⅴ. Special notes for reviews

update runc version to 1.0.0-rc4-2, support checkpoint/restore
function.

Signed-off-by: Ace-Tang <[email protected]>
@Ace-Tang
Copy link
Contributor Author

For package pouch on centos distro, install runc through

# build lxcfs and install containerd, runc and pouch
function build_pouch()
{
    pushd $BASEDIR/pouch
    # install containerd, runc and lxcfs dependencies for packaging
    make package-dependencies
    # build pouch
    make build
    make install DEST_DIR="$POUCHDIR"
    popd

    # make sure related binaries are included by pouch package
    cp $USRBINDIR/containerd* $USRBINDIR/ctr $USRBINDIR/runc "$BINDIR"

}

make package-dependencies is here from Makefile

.PHONY: package-dependencies
package-dependencies: ## install containerd, runc and lxcfs dependencies for packaging
    @echo $@
    hack/install/install_containerd.sh
    hack/install/install_lxcfs.sh
    hack/install/install_runc.sh   --> here we will install runc new version
    hack/install/install_criu.sh

So we just need to update runc version in making deb package.

@fuweid
Copy link
Contributor

fuweid commented Aug 31, 2018

@Ace-Tang LGTM

@codecov-io
Copy link

Codecov Report

Merging #2183 into master will increase coverage by 0.04%.
The diff coverage is n/a.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #2183      +/-   ##
==========================================
+ Coverage   64.99%   65.03%   +0.04%     
==========================================
  Files         209      209              
  Lines       16739    16739              
==========================================
+ Hits        10879    10886       +7     
+ Misses       4514     4509       -5     
+ Partials     1346     1344       -2
Flag Coverage Δ
#criv1alpha1test 32.91% <ø> (ø) ⬆️
#criv1alpha2test 33.6% <ø> (+0.12%) ⬆️
#integrationtest 39.97% <ø> (+0.01%) ⬆️
#unittest 23.95% <ø> (ø) ⬆️
Impacted Files Coverage Δ
cri/v1alpha1/cri.go 62.95% <0%> (-0.35%) ⬇️
cri/v1alpha2/cri.go 63.99% <0%> (+0.65%) ⬆️
daemon/mgr/system.go 79.5% <0%> (+1.63%) ⬆️
daemon/mgr/snapshot.go 94.2% <0%> (+4.34%) ⬆️

@chuanchang
Copy link
Contributor

@Ace-Tang LGTM

@fuweid fuweid merged commit 9ef90e3 into AliyunContainerService:master Aug 31, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants