1. docker
  2. Commit 554d657c1f7a0f4dce51f0d26407fb05a0580fa1
Browse code

containerd: update to 1.0.3 release

Signed-off-by: Stephen J Day <stephen.day@docker.com>

Stephen J Day authored on 2018/03/31 03:47:50
Showing 26 changed files
hack/dockerfile/install/containerd.installer
History View file @ 554d657
... ... 
@@ -4,7 +4,7 @@
4 4 
 # containerd is also pinned in vendor.conf. When updating the binary
5 5 
 # version you may also need to update the vendor version to pick up bug
6 6 
 # fixes or new APIs.
7 
-CONTAINERD_COMMIT=cfd04396dc68220d1cecbe686a6cc3aa5ce3667c # v1.0.2
7 
+CONTAINERD_COMMIT=773c489c9c1b21a6d78b5c538cd395416ec50f88 # v1.0.3
8 8
9 9 
 install_containerd() {
10 10 
 	echo "Install containerd version $CONTAINERD_COMMIT"
vendor.conf
History View file @ 554d657
... ... 
@@ -111,7 +111,7 @@ google.golang.org/genproto d80a6e20e776b0b17a324d0ba1ab50a39c8e8944
111 111 
 github.com/containerd/containerd 3fa104f843ec92328912e042b767d26825f202aa
112 112 
 github.com/containerd/fifo fbfb6a11ec671efbe94ad1c12c2e98773f19e1e6
113 113 
 github.com/containerd/continuity d8fb8589b0e8e85b8c8bbaa8840226d0dfeb7371
114 
-github.com/containerd/cgroups c0710c92e8b3a44681d1321dcfd1360fc5c6c089
114 
+github.com/containerd/cgroups fe281dd265766145e943a034aa41086474ea6130
115 115 
 github.com/containerd/console 2748ece16665b45a47f884001d5831ec79703880
116 116 
 github.com/containerd/go-runc 4f6e87ae043f859a38255247b49c9abc262d002f
117 117 
 github.com/containerd/typeurl f6943554a7e7e88b3c14aad190bf05932da84788
vendor/github.com/containerd/cgroups/blkio.go
History View file @ 554d657
... ... 
@@ -1,3 +1,19 @@
1 
+/*
2 
+   Copyright The containerd Authors.
3 
+
4 
+   Licensed under the Apache License, Version 2.0 (the "License");
5 
+   you may not use this file except in compliance with the License.
6 
+   You may obtain a copy of the License at
7 
+
8 
+       http://www.apache.org/licenses/LICENSE-2.0
9 
+
10 
+   Unless required by applicable law or agreed to in writing, software
11 
+   distributed under the License is distributed on an "AS IS" BASIS,
12 
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13 
+   See the License for the specific language governing permissions and
14 
+   limitations under the License.
15 
+*/
16 
+
1 17 
 package cgroups
2 18
3 19 
 import (
vendor/github.com/containerd/cgroups/cgroup.go
History View file @ 554d657
... ... 
@@ -1,3 +1,19 @@
1 
+/*
2 
+   Copyright The containerd Authors.
3 
+
4 
+   Licensed under the Apache License, Version 2.0 (the "License");
5 
+   you may not use this file except in compliance with the License.
6 
+   You may obtain a copy of the License at
7 
+
8 
+       http://www.apache.org/licenses/LICENSE-2.0
9 
+
10 
+   Unless required by applicable law or agreed to in writing, software
11 
+   distributed under the License is distributed on an "AS IS" BASIS,
12 
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13 
+   See the License for the specific language governing permissions and
14 
+   limitations under the License.
15 
+*/
16 
+
1 17 
 package cgroups
2 18
3 19 
 import (
vendor/github.com/containerd/cgroups/control.go
History View file @ 554d657
... ... 
@@ -1,3 +1,19 @@
1 
+/*
2 
+   Copyright The containerd Authors.
3 
+
4 
+   Licensed under the Apache License, Version 2.0 (the "License");
5 
+   you may not use this file except in compliance with the License.
6 
+   You may obtain a copy of the License at
7 
+
8 
+       http://www.apache.org/licenses/LICENSE-2.0
9 
+
10 
+   Unless required by applicable law or agreed to in writing, software
11 
+   distributed under the License is distributed on an "AS IS" BASIS,
12 
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13 
+   See the License for the specific language governing permissions and
14 
+   limitations under the License.
15 
+*/
16 
+
1 17 
 package cgroups
2 18
3 19 
 import (
vendor/github.com/containerd/cgroups/cpu.go
History View file @ 554d657
... ... 
@@ -1,3 +1,19 @@
1 
+/*
2 
+   Copyright The containerd Authors.
3 
+
4 
+   Licensed under the Apache License, Version 2.0 (the "License");
5 
+   you may not use this file except in compliance with the License.
6 
+   You may obtain a copy of the License at
7 
+
8 
+       http://www.apache.org/licenses/LICENSE-2.0
9 
+
10 
+   Unless required by applicable law or agreed to in writing, software
11 
+   distributed under the License is distributed on an "AS IS" BASIS,
12 
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13 
+   See the License for the specific language governing permissions and
14 
+   limitations under the License.
15 
+*/
16 
+
1 17 
 package cgroups
2 18
3 19 
 import (
vendor/github.com/containerd/cgroups/cpuacct.go
History View file @ 554d657
... ... 
@@ -1,3 +1,19 @@
1 
+/*
2 
+   Copyright The containerd Authors.
3 
+
4 
+   Licensed under the Apache License, Version 2.0 (the "License");
5 
+   you may not use this file except in compliance with the License.
6 
+   You may obtain a copy of the License at
7 
+
8 
+       http://www.apache.org/licenses/LICENSE-2.0
9 
+
10 
+   Unless required by applicable law or agreed to in writing, software
11 
+   distributed under the License is distributed on an "AS IS" BASIS,
12 
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13 
+   See the License for the specific language governing permissions and
14 
+   limitations under the License.
15 
+*/
16 
+
1 17 
 package cgroups
2 18
3 19 
 import (
vendor/github.com/containerd/cgroups/cpuset.go
History View file @ 554d657
... ... 
@@ -1,3 +1,19 @@
1 
+/*
2 
+   Copyright The containerd Authors.
3 
+
4 
+   Licensed under the Apache License, Version 2.0 (the "License");
5 
+   you may not use this file except in compliance with the License.
6 
+   You may obtain a copy of the License at
7 
+
8 
+       http://www.apache.org/licenses/LICENSE-2.0
9 
+
10 
+   Unless required by applicable law or agreed to in writing, software
11 
+   distributed under the License is distributed on an "AS IS" BASIS,
12 
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13 
+   See the License for the specific language governing permissions and
14 
+   limitations under the License.
15 
+*/
16 
+
1 17 
 package cgroups
2 18
3 19 
 import (
vendor/github.com/containerd/cgroups/devices.go
History View file @ 554d657
... ... 
@@ -1,3 +1,19 @@
1 
+/*
2 
+   Copyright The containerd Authors.
3 
+
4 
+   Licensed under the Apache License, Version 2.0 (the "License");
5 
+   you may not use this file except in compliance with the License.
6 
+   You may obtain a copy of the License at
7 
+
8 
+       http://www.apache.org/licenses/LICENSE-2.0
9 
+
10 
+   Unless required by applicable law or agreed to in writing, software
11 
+   distributed under the License is distributed on an "AS IS" BASIS,
12 
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13 
+   See the License for the specific language governing permissions and
14 
+   limitations under the License.
15 
+*/
16 
+
1 17 
 package cgroups
2 18
3 19 
 import (
... ... 
@@ -58,11 +74,11 @@ func (d *devicesController) Update(path string, resources *specs.LinuxResources)
58 58 
 }
59 59
60 60 
 func deviceString(device specs.LinuxDeviceCgroup) string {
61 
-	return fmt.Sprintf("%c %s:%s %s",
62 
-		&device.Type,
61 
+	return fmt.Sprintf("%s %s:%s %s",
62 
+		device.Type,
63 63 
 		deviceNumber(device.Major),
64 64 
 		deviceNumber(device.Minor),
65 
-		&device.Access,
65 
+		device.Access,
66 66 
 	)
67 67 
 }
68 68
vendor/github.com/containerd/cgroups/errors.go
History View file @ 554d657
... ... 
@@ -1,3 +1,19 @@
1 
+/*
2 
+   Copyright The containerd Authors.
3 
+
4 
+   Licensed under the Apache License, Version 2.0 (the "License");
5 
+   you may not use this file except in compliance with the License.
6 
+   You may obtain a copy of the License at
7 
+
8 
+       http://www.apache.org/licenses/LICENSE-2.0
9 
+
10 
+   Unless required by applicable law or agreed to in writing, software
11 
+   distributed under the License is distributed on an "AS IS" BASIS,
12 
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13 
+   See the License for the specific language governing permissions and
14 
+   limitations under the License.
15 
+*/
16 
+
1 17 
 package cgroups
2 18
3 19 
 import (
vendor/github.com/containerd/cgroups/freezer.go
History View file @ 554d657
... ... 
@@ -1,3 +1,19 @@
1 
+/*
2 
+   Copyright The containerd Authors.
3 
+
4 
+   Licensed under the Apache License, Version 2.0 (the "License");
5 
+   you may not use this file except in compliance with the License.
6 
+   You may obtain a copy of the License at
7 
+
8 
+       http://www.apache.org/licenses/LICENSE-2.0
9 
+
10 
+   Unless required by applicable law or agreed to in writing, software
11 
+   distributed under the License is distributed on an "AS IS" BASIS,
12 
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13 
+   See the License for the specific language governing permissions and
14 
+   limitations under the License.
15 
+*/
16 
+
1 17 
 package cgroups
2 18
3 19 
 import (
vendor/github.com/containerd/cgroups/hierarchy.go
History View file @ 554d657
... ... 
@@ -1,3 +1,19 @@
1 
+/*
2 
+   Copyright The containerd Authors.
3 
+
4 
+   Licensed under the Apache License, Version 2.0 (the "License");
5 
+   you may not use this file except in compliance with the License.
6 
+   You may obtain a copy of the License at
7 
+
8 
+       http://www.apache.org/licenses/LICENSE-2.0
9 
+
10 
+   Unless required by applicable law or agreed to in writing, software
11 
+   distributed under the License is distributed on an "AS IS" BASIS,
12 
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13 
+   See the License for the specific language governing permissions and
14 
+   limitations under the License.
15 
+*/
16 
+
1 17 
 package cgroups
2 18
3 19 
 // Hierarchy enableds both unified and split hierarchy for cgroups
vendor/github.com/containerd/cgroups/hugetlb.go
History View file @ 554d657
... ... 
@@ -1,3 +1,19 @@
1 
+/*
2 
+   Copyright The containerd Authors.
3 
+
4 
+   Licensed under the Apache License, Version 2.0 (the "License");
5 
+   you may not use this file except in compliance with the License.
6 
+   You may obtain a copy of the License at
7 
+
8 
+       http://www.apache.org/licenses/LICENSE-2.0
9 
+
10 
+   Unless required by applicable law or agreed to in writing, software
11 
+   distributed under the License is distributed on an "AS IS" BASIS,
12 
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13 
+   See the License for the specific language governing permissions and
14 
+   limitations under the License.
15 
+*/
16 
+
1 17 
 package cgroups
2 18
3 19 
 import (
vendor/github.com/containerd/cgroups/memory.go
History View file @ 554d657
... ... 
@@ -1,3 +1,19 @@
1 
+/*
2 
+   Copyright The containerd Authors.
3 
+
4 
+   Licensed under the Apache License, Version 2.0 (the "License");
5 
+   you may not use this file except in compliance with the License.
6 
+   You may obtain a copy of the License at
7 
+
8 
+       http://www.apache.org/licenses/LICENSE-2.0
9 
+
10 
+   Unless required by applicable law or agreed to in writing, software
11 
+   distributed under the License is distributed on an "AS IS" BASIS,
12 
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13 
+   See the License for the specific language governing permissions and
14 
+   limitations under the License.
15 
+*/
16 
+
1 17 
 package cgroups
2 18
3 19 
 import (
vendor/github.com/containerd/cgroups/named.go
History View file @ 554d657
... ... 
@@ -1,3 +1,19 @@
1 
+/*
2 
+   Copyright The containerd Authors.
3 
+
4 
+   Licensed under the Apache License, Version 2.0 (the "License");
5 
+   you may not use this file except in compliance with the License.
6 
+   You may obtain a copy of the License at
7 
+
8 
+       http://www.apache.org/licenses/LICENSE-2.0
9 
+
10 
+   Unless required by applicable law or agreed to in writing, software
11 
+   distributed under the License is distributed on an "AS IS" BASIS,
12 
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13 
+   See the License for the specific language governing permissions and
14 
+   limitations under the License.
15 
+*/
16 
+
1 17 
 package cgroups
2 18
3 19 
 import "path/filepath"
vendor/github.com/containerd/cgroups/net_cls.go
History View file @ 554d657
... ... 
@@ -1,3 +1,19 @@
1 
+/*
2 
+   Copyright The containerd Authors.
3 
+
4 
+   Licensed under the Apache License, Version 2.0 (the "License");
5 
+   you may not use this file except in compliance with the License.
6 
+   You may obtain a copy of the License at
7 
+
8 
+       http://www.apache.org/licenses/LICENSE-2.0
9 
+
10 
+   Unless required by applicable law or agreed to in writing, software
11 
+   distributed under the License is distributed on an "AS IS" BASIS,
12 
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13 
+   See the License for the specific language governing permissions and
14 
+   limitations under the License.
15 
+*/
16 
+
1 17 
 package cgroups
2 18
3 19 
 import (
vendor/github.com/containerd/cgroups/net_prio.go
History View file @ 554d657
... ... 
@@ -1,3 +1,19 @@
1 
+/*
2 
+   Copyright The containerd Authors.
3 
+
4 
+   Licensed under the Apache License, Version 2.0 (the "License");
5 
+   you may not use this file except in compliance with the License.
6 
+   You may obtain a copy of the License at
7 
+
8 
+       http://www.apache.org/licenses/LICENSE-2.0
9 
+
10 
+   Unless required by applicable law or agreed to in writing, software
11 
+   distributed under the License is distributed on an "AS IS" BASIS,
12 
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13 
+   See the License for the specific language governing permissions and
14 
+   limitations under the License.
15 
+*/
16 
+
1 17 
 package cgroups
2 18
3 19 
 import (
vendor/github.com/containerd/cgroups/paths.go
History View file @ 554d657
... ... 
@@ -1,3 +1,19 @@
1 
+/*
2 
+   Copyright The containerd Authors.
3 
+
4 
+   Licensed under the Apache License, Version 2.0 (the "License");
5 
+   you may not use this file except in compliance with the License.
6 
+   You may obtain a copy of the License at
7 
+
8 
+       http://www.apache.org/licenses/LICENSE-2.0
9 
+
10 
+   Unless required by applicable law or agreed to in writing, software
11 
+   distributed under the License is distributed on an "AS IS" BASIS,
12 
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13 
+   See the License for the specific language governing permissions and
14 
+   limitations under the License.
15 
+*/
16 
+
1 17 
 package cgroups
2 18
3 19 
 import (
vendor/github.com/containerd/cgroups/perf_event.go
History View file @ 554d657
... ... 
@@ -1,3 +1,19 @@
1 
+/*
2 
+   Copyright The containerd Authors.
3 
+
4 
+   Licensed under the Apache License, Version 2.0 (the "License");
5 
+   you may not use this file except in compliance with the License.
6 
+   You may obtain a copy of the License at
7 
+
8 
+       http://www.apache.org/licenses/LICENSE-2.0
9 
+
10 
+   Unless required by applicable law or agreed to in writing, software
11 
+   distributed under the License is distributed on an "AS IS" BASIS,
12 
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13 
+   See the License for the specific language governing permissions and
14 
+   limitations under the License.
15 
+*/
16 
+
1 17 
 package cgroups
2 18
3 19 
 import "path/filepath"
vendor/github.com/containerd/cgroups/pids.go
History View file @ 554d657
... ... 
@@ -1,3 +1,19 @@
1 
+/*
2 
+   Copyright The containerd Authors.
3 
+
4 
+   Licensed under the Apache License, Version 2.0 (the "License");
5 
+   you may not use this file except in compliance with the License.
6 
+   You may obtain a copy of the License at
7 
+
8 
+       http://www.apache.org/licenses/LICENSE-2.0
9 
+
10 
+   Unless required by applicable law or agreed to in writing, software
11 
+   distributed under the License is distributed on an "AS IS" BASIS,
12 
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13 
+   See the License for the specific language governing permissions and
14 
+   limitations under the License.
15 
+*/
16 
+
1 17 
 package cgroups
2 18
3 19 
 import (
vendor/github.com/containerd/cgroups/state.go
History View file @ 554d657
... ... 
@@ -1,3 +1,19 @@
1 
+/*
2 
+   Copyright The containerd Authors.
3 
+
4 
+   Licensed under the Apache License, Version 2.0 (the "License");
5 
+   you may not use this file except in compliance with the License.
6 
+   You may obtain a copy of the License at
7 
+
8 
+       http://www.apache.org/licenses/LICENSE-2.0
9 
+
10 
+   Unless required by applicable law or agreed to in writing, software
11 
+   distributed under the License is distributed on an "AS IS" BASIS,
12 
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13 
+   See the License for the specific language governing permissions and
14 
+   limitations under the License.
15 
+*/
16 
+
1 17 
 package cgroups
2 18
3 19 
 // State is a type that represents the state of the current cgroup
vendor/github.com/containerd/cgroups/subsystem.go
History View file @ 554d657
... ... 
@@ -1,3 +1,19 @@
1 
+/*
2 
+   Copyright The containerd Authors.
3 
+
4 
+   Licensed under the Apache License, Version 2.0 (the "License");
5 
+   you may not use this file except in compliance with the License.
6 
+   You may obtain a copy of the License at
7 
+
8 
+       http://www.apache.org/licenses/LICENSE-2.0
9 
+
10 
+   Unless required by applicable law or agreed to in writing, software
11 
+   distributed under the License is distributed on an "AS IS" BASIS,
12 
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13 
+   See the License for the specific language governing permissions and
14 
+   limitations under the License.
15 
+*/
16 
+
1 17 
 package cgroups
2 18
3 19 
 import (
vendor/github.com/containerd/cgroups/systemd.go
History View file @ 554d657
... ... 
@@ -1,3 +1,19 @@
1 
+/*
2 
+   Copyright The containerd Authors.
3 
+
4 
+   Licensed under the Apache License, Version 2.0 (the "License");
5 
+   you may not use this file except in compliance with the License.
6 
+   You may obtain a copy of the License at
7 
+
8 
+       http://www.apache.org/licenses/LICENSE-2.0
9 
+
10 
+   Unless required by applicable law or agreed to in writing, software
11 
+   distributed under the License is distributed on an "AS IS" BASIS,
12 
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13 
+   See the License for the specific language governing permissions and
14 
+   limitations under the License.
15 
+*/
16 
+
1 17 
 package cgroups
2 18
3 19 
 import (
vendor/github.com/containerd/cgroups/ticks.go
History View file @ 554d657
... ... 
@@ -1,3 +1,19 @@
1 
+/*
2 
+   Copyright The containerd Authors.
3 
+
4 
+   Licensed under the Apache License, Version 2.0 (the "License");
5 
+   you may not use this file except in compliance with the License.
6 
+   You may obtain a copy of the License at
7 
+
8 
+       http://www.apache.org/licenses/LICENSE-2.0
9 
+
10 
+   Unless required by applicable law or agreed to in writing, software
11 
+   distributed under the License is distributed on an "AS IS" BASIS,
12 
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13 
+   See the License for the specific language governing permissions and
14 
+   limitations under the License.
15 
+*/
16 
+
1 17 
 package cgroups
2 18
3 19 
 func getClockTicks() uint64 {
vendor/github.com/containerd/cgroups/utils.go
History View file @ 554d657
... ... 
@@ -1,3 +1,19 @@
1 
+/*
2 
+   Copyright The containerd Authors.
3 
+
4 
+   Licensed under the Apache License, Version 2.0 (the "License");
5 
+   you may not use this file except in compliance with the License.
6 
+   You may obtain a copy of the License at
7 
+
8 
+       http://www.apache.org/licenses/LICENSE-2.0
9 
+
10 
+   Unless required by applicable law or agreed to in writing, software
11 
+   distributed under the License is distributed on an "AS IS" BASIS,
12 
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13 
+   See the License for the specific language governing permissions and
14 
+   limitations under the License.
15 
+*/
16 
+
1 17 
 package cgroups
2 18
3 19 
 import (
vendor/github.com/containerd/cgroups/v1.go
History View file @ 554d657
... ... 
@@ -1,3 +1,19 @@
1 
+/*
2 
+   Copyright The containerd Authors.
3 
+
4 
+   Licensed under the Apache License, Version 2.0 (the "License");
5 
+   you may not use this file except in compliance with the License.
6 
+   You may obtain a copy of the License at
7 
+
8 
+       http://www.apache.org/licenses/LICENSE-2.0
9 
+
10 
+   Unless required by applicable law or agreed to in writing, software
11 
+   distributed under the License is distributed on an "AS IS" BASIS,
12 
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13 
+   See the License for the specific language governing permissions and
14 
+   limitations under the License.
15 
+*/
16 
+
1 17 
 package cgroups
2 18
3 19 
 import (