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

refactor: facilitate make.sh build #1261

Merged
merged 1 commit into from
May 4, 2018

Conversation

u2takey
Copy link
Contributor

@u2takey u2takey commented May 2, 2018

Signed-off-by: u2takey u2takey@gmail.com

Ⅰ. Describe what this PR did

facilitate make.sh build by checking install status before do install binaries

@codecov-io
Copy link

codecov-io commented May 2, 2018

Codecov Report

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

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #1261      +/-   ##
==========================================
+ Coverage   15.24%   15.31%   +0.07%     
==========================================
  Files         172      172              
  Lines       10715    10665      -50     
==========================================
  Hits         1633     1633              
+ Misses       8962     8912      -50     
  Partials      120      120
Impacted Files Coverage Δ
daemon/mgr/cri_stream.go 0% <0%> (ø) ⬆️
daemon/mgr/cri.go 0% <0%> (ø) ⬆️
daemon/mgr/container.go 0% <0%> (ø) ⬆️
daemon/containerio/options.go 0% <0%> (ø) ⬆️
cli/cli.go 0% <0%> (ø) ⬆️
daemon/mgr/container_types.go 25.31% <0%> (ø) ⬆️
daemon/mgr/spec_hook.go 0% <0%> (ø) ⬆️
daemon/containerio/container_io.go 0% <0%> (ø) ⬆️
cli/inspect.go 0% <0%> (ø) ⬆️
daemon/config/config.go 10% <0%> (+2.1%) ⬆️

@HusterWan HusterWan requested a review from Letty5411 May 2, 2018 09:33
@HusterWan
Copy link
Contributor

@u2takey Thanks a lot for your PR

@Letty5411 could your please review this PR?

@allencloud
Copy link
Collaborator

ping @sunyuan3 @Letty5411 Please take a look at and review this.

hack/make.sh Outdated
{
echo "Try installing containerd"
get_containerd_version
if [ "$CONTAINERD_VERSION" = "v1.0.3" ]; then
Copy link
Contributor

@Letty5411 Letty5411 May 3, 2018

Choose a reason for hiding this comment

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

= to be ==
And I would prefer using [[ ]], same comments for the following code.

hack/make.sh Outdated
echo "Nsenter already installed."
else
echo "Download and install nsenter."
apt-get install libncurses5-dev libslang2-dev gettext zlib1g-dev libselinux1-dev debhelper lsb-release pkg-config po-debconf autoconf automake autopoint libtool
Copy link
Contributor

Choose a reason for hiding this comment

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

apt-get install -y

hack/make.sh Outdated
else
echo "Download and install nsenter."
apt-get install libncurses5-dev libslang2-dev gettext zlib1g-dev libselinux1-dev debhelper lsb-release pkg-config po-debconf autoconf automake autopoint libtool
wget https://www.kernel.org/pub/linux/utils/util-linux/v2.24/util-linux-2.24.1.tar.gz -P $TMP
Copy link
Contributor

Choose a reason for hiding this comment

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

wget -q

hack/make.sh Outdated
echo "Dumb-init already installed."
else
echo "Download and install dumb-init."
wget -O /tmp/dumb-init https://github.com/Yelp/dumb-init/releases/download/v1.2.1/dumb-init_1.2.1_amd64
Copy link
Contributor

Choose a reason for hiding this comment

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

wget -q

check install status before do install binaries

Signed-off-by: u2takey <u2takey@gmail.com>
@u2takey
Copy link
Contributor Author

u2takey commented May 4, 2018

updated,ping @sunyuan3 @Letty5411 for review

@sunyuan3
Copy link
Contributor

sunyuan3 commented May 4, 2018

LGTM

@pouchrobot pouchrobot added the LGTM one maintainer or community participant agrees to merge the pull reuqest. label May 4, 2018
@sunyuan3 sunyuan3 merged commit 5ce1e4d into AliyunContainerService:master May 4, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
areas/test kind/refactor LGTM one maintainer or community participant agrees to merge the pull reuqest. size/L
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants