Skip to content

Commit b14e144

Browse files
authored
Merge pull request #1148 from fuweid/feature_update_containerd_to_v103
feature: upgrade containerd version to v1.0.3
2 parents fac1f29 + 4713447 commit b14e144

File tree

20 files changed

+307
-273
lines changed

20 files changed

+307
-273
lines changed

INSTALLATION.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ As a developer, you may need to build and test Pouch binaries via source code. T
154154

155155
* Linux Kernel 3.10+
156156
* Go 1.9.0+
157-
* containerd: 1.0.0
157+
* containerd: 1.0.3
158158
* runc: 1.0.0-rc4
159159
* runv: 1.0.0 (option)
160160

@@ -170,8 +170,8 @@ Here are the shell scripts to install `containerd` and `runc`:
170170

171171
``` shell
172172
# install containerd
173-
$ wget https://github.com/containerd/containerd/releases/download/v1.0.0/containerd-1.0.0.linux-amd64.tar.gz
174-
$ tar -xzvf containerd-1.0.0.linux-amd64.tar.gz -C /usr/local
173+
$ wget https://github.com/containerd/containerd/releases/download/v1.0.3/containerd-1.0.3.linux-amd64.tar.gz
174+
$ tar -xzvf containerd-1.0.3.linux-amd64.tar.gz -C /usr/local
175175
$
176176
# install runc
177177
$ wget https://github.com/opencontainers/runc/releases/download/v1.0.0-rc4/runc.amd64 -P /usr/local/bin
@@ -207,7 +207,7 @@ With all needed binaries installed, you could start pouchd via:
207207

208208
``` shell
209209
$ pouchd
210-
INFO[0000] starting containerd module=containerd revision=a543c937eb0a05e1636714ee2be70819d745b960 version=v1.0.0-beta.2
210+
INFO[0000] starting containerd module=containerd revision=773c489c9c1b21a6d78b5c538cd395416ec50f88 version=v1.0.3
211211
INFO[0000] setting subreaper... module=containerd
212212
INFO[0000] loading plugin "io.containerd.content.v1.content"... module=containerd type=io.containerd.content.v1
213213
INFO[0000] loading plugin "io.containerd.snapshotter.v1.btrfs"... module=containerd type=io.containerd.snapshotter.v1

hack/make.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ function install_pouch ()
2121
{
2222
# install containerd
2323
echo "Download and install containerd."
24-
wget --quiet https://github.com/containerd/containerd/releases/download/v1.0.0/containerd-1.0.0.linux-amd64.tar.gz -P $TMP
25-
tar xf $TMP/containerd-1.0.0.linux-amd64.tar.gz -C $TMP && cp -f $TMP/bin/* /usr/local/bin/
24+
wget --quiet https://github.com/containerd/containerd/releases/download/v1.0.3/containerd-1.0.3.linux-amd64.tar.gz -P $TMP
25+
tar xf $TMP/containerd-1.0.3.linux-amd64.tar.gz -C $TMP && cp -f $TMP/bin/* /usr/local/bin/
2626

2727
# install runc
2828
echo "Download and install runc."

hack/package/deb/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,8 @@ install: build
5252
# install containerd
5353
echo "Download and install containerd."
5454
[ -d $(TMP) ] || mkdir -p /tmp/tmp.pouch
55-
wget --quiet https://github.com/containerd/containerd/releases/download/v1.0.0/containerd-1.0.0.linux-amd64.tar.gz -P $(TMP)
56-
tar xf $(TMP)/containerd-1.0.0.linux-amd64.tar.gz -C $(TMP) && cp -f $(TMP)/bin/* debian/pouch/usr/bin/
55+
wget --quiet https://github.com/containerd/containerd/releases/download/v1.0.3/containerd-1.0.3.linux-amd64.tar.gz -P $(TMP)
56+
tar xf $(TMP)/containerd-1.0.3.linux-amd64.tar.gz -C $(TMP) && cp -f $(TMP)/bin/* debian/pouch/usr/bin/
5757

5858
# install runc
5959
echo "Download and install runc."

hack/package/rpm/build.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,8 @@ function build_pouch()
4848
{
4949
# install containerd
5050
echo "Downloading containerd."
51-
wget --quiet https://github.com/containerd/containerd/releases/download/v1.0.0/containerd-1.0.0.linux-amd64.tar.gz -P $TMP
52-
tar xf $TMP/containerd-1.0.0.linux-amd64.tar.gz -C $TMP && cp -f $TMP/bin/* $BINDIR/
51+
wget --quiet https://github.com/containerd/containerd/releases/download/v1.0.3/containerd-1.0.3.linux-amd64.tar.gz -P $TMP
52+
tar xf $TMP/containerd-1.0.3.linux-amd64.tar.gz -C $TMP && cp -f $TMP/bin/* $BINDIR/
5353

5454
# install runc
5555
echo "Downloading runc."

vendor/github.com/containerd/containerd/Makefile

Lines changed: 7 additions & 14 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/containerd/containerd/RUNC.md

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/containerd/containerd/cio/io.go

Lines changed: 8 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/containerd/containerd/cio/io_unix.go

Lines changed: 10 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/containerd/containerd/cio/io_windows.go

Lines changed: 13 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/containerd/containerd/content/helpers.go

Lines changed: 17 additions & 16 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)