Daniel, Dao Quang Minh
579093f13f
Merge pull request #1579 from tklauser/vendor-ansiterm
...
Remove stray entry for Azure/go-ansiterm from vendor.conf
2017-10-02 14:53:34 +01:00
Tobias Klauser
f01b139161
archive: use Mkdev, Major and Minor functions from golang.org/x/sys/unix
...
Now that golang.org/x/sys/unix provides the Mkdev, Major and Minor
functions for every OS, use them instead of the locally defined version
which uses the Linux specific device major/minor encoding.
This also means that the device number should now be properly encoded on
e.g. Darwin, FreeBSD or Solaris.
Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
2017-10-02 15:13:03 +02:00
Tobias Klauser
727fd599fb
ctr: remove SIGUNUSED from signal map
...
The SIGUNUSED constant was removed from golang.org/x/sys/unix in
https://go-review.googlesource.com/61771 as it is also removed from the
respective glibc headers.
This means the command
ctr tasks kill SIGUNUSED ...
will no longer work. However, the same effect can be achieved with
ctr tasks kill SIGSYS ...
as SIGSYS has the same value as SIGUNUSED used to have.
Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
2017-10-02 15:10:31 +02:00
Tobias Klauser
e789135aa3
vendor: update golang.org/x/sys
...
Update golang.org/x/sys to 314a259e304ff91bd6985da2a7149bbf91237993
Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
2017-10-02 14:51:12 +02:00
Tobias Klauser
acc246e5d9
Remove stray entry for Azure/go-ansiterm from vendor.conf
...
go-ansiterm is no longer used since commit cf2c4609bd
("Bump runc with
console change for ONLCR") but for some reason there was a second entry
in vendor.conf. Remove it as well.
This fixes the following warning when running vndr:
WARNING: package github.com/Azure/go-ansiterm is unused, consider removing it from vendor.conf
Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
2017-10-02 14:47:45 +02:00
Stephen J Day
ce6859fd25
images: provide separated children function for images
...
Signed-off-by: Stephen J Day <stephen.day@docker.com>
2017-09-29 13:47:54 -07:00
Kenfe-Mickaël Laventure
16bf82360e
Merge pull request #1570 from AkihiroSuda/oci-runtime-readonly
...
readonly: pass RW rootfs to runtime, and let the runtime remount it as RO
2017-09-29 13:36:26 -07:00
Lantao Liu
29d9a788e6
Merge pull request #313 from Random-Liu/update-ansible
...
Update ansible playbook release version.
2017-09-29 09:56:59 -07:00
Lantao Liu
60ea331f9f
Update ansible playbook release version.
...
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-09-29 06:21:28 +00:00
Akihiro Suda
27023c7fa2
readonly: pass RW rootfs to runtime, and let the runtime remount it as RO
...
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
2017-09-29 06:20:26 +00:00
Lantao Liu
125152b944
Merge pull request #312 from Random-Liu/update-cri-tools-version
...
Update critools version to v0.2.
2017-09-28 21:03:40 -07:00
Lantao Liu
ba757745d2
Update critools version to v0.2.
...
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-09-29 03:23:36 +00:00
Lantao Liu
5acb73841c
Merge pull request #311 from Random-Liu/update-kubernetes
...
Update Kubernetes to v1.8.0
2017-09-28 20:22:08 -07:00
Lantao Liu
651b0185e1
Update Kubernetes to v1.8.0
...
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-09-29 02:51:46 +00:00
Lantao Liu
4d0a2338c4
Merge pull request #309 from Random-Liu/update-readme
...
Update README.md
2017-09-28 18:18:51 -07:00
Lantao Liu
fd032461fb
Update README.md
...
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-09-29 00:10:18 +00:00
Lantao Liu
98c5bd80ca
Merge pull request #306 from Random-Liu/update-kubernetes
...
Update kubernetes to v1.8.0-rc.1
2017-09-28 16:52:47 -07:00
Lantao Liu
4127e0e295
Merge pull request #307 from Random-Liu/rename-getting-started
...
Rename getting-started.md to README.md.
2017-09-28 16:17:21 -07:00
Lantao Liu
8c7ddee69d
Rename getting-started.md to README.md.
...
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-09-28 23:11:00 +00:00
Lantao Liu
6063b580a4
Merge pull request #308 from mikebrow/quick-readme-update
...
minor update to the readme
2017-09-28 15:29:12 -07:00
Mike Brown
39ec8fa9ae
minor update to the readme
...
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
2017-09-28 17:19:40 -05:00
Lantao Liu
126c0a0e80
Update kubernetes to v1.8.0-rc.1
...
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-09-28 21:28:27 +00:00
Lantao Liu
f586073b1c
Merge pull request #294 from Random-Liu/cleanup-flags
...
Cleanup flag default value
2017-09-28 13:13:14 -07:00
Lantao Liu
a7b78d7622
Merge pull request #297 from ijc/use-stat-for-device-uuid-comparison
...
Use stat_t.st_rdev to compare block devices
2017-09-28 11:30:34 -07:00
Lantao Liu
dc947114bb
Cleanup flag default value
...
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-09-28 18:24:40 +00:00
Derek McGowan
70b353dff2
Merge pull request #1551 from mlaventure/client-pull-set-labels
...
client: Allow setting image labels on Pull()
2017-09-28 10:18:11 -07:00
Akihiro Suda
9f84513b89
Merge pull request #1571 from allencloud/remove-defaultns-from-Client
...
remove field defaultns from struct Client
2017-09-29 01:06:20 +09:00
Allen Sun
fd44a3aec4
remove field defaultns from struct Client
...
Signed-off-by: Allen Sun <shlallen1990@gmail.com>
2017-09-28 23:53:21 +08:00
Abhinandan Prativadi
1784b073bc
Merge pull request #301 from Random-Liu/fix-container-stats
...
Fix container stats.
2017-09-28 06:02:42 -07:00
Lantao Liu
de6287d626
Fix container stats.
...
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-09-28 05:49:44 +00:00
Lantao Liu
d6e04d871e
Merge pull request #300 from Random-Liu/improve-some-error-message
...
Better format several errors
2017-09-27 22:47:15 -07:00
Lantao Liu
517f697f62
Better format several errors
...
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-09-28 01:15:06 +00:00
Lantao Liu
e723a5018b
Merge pull request #293 from Random-Liu/cleanup-container-metrics
...
Fix and cleanup container metrics
2017-09-27 17:17:46 -07:00
Lantao Liu
97b6e82d98
Fix and cleanup container metrics
...
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-09-27 23:43:00 +00:00
Kenfe-Mickael Laventure
df82159f4d
client: Allow setting image labels on Pull() and Import()
...
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
2017-09-27 15:05:34 -07:00
Abhinandan Prativadi
cc5d3ef96a
Merge pull request #296 from abhinandanpb/stats_time
...
Setting the cpu and memory stats of containers in nanoseconds
2017-09-27 09:22:56 -07:00
Ian Campbell
11714fb6a3
Use stat_t.st_rdev to compare block devices
...
I implemented /dev/disk/by-uuid on my platform but using absolute links (where
udev typically uses relative) which broke the code in `os.DeviceUUID`.
Rather than just patch that up directly instead stat both the target and
candidate devices and pick one with matching major:minor in st_rdev. This saves
manually building paths to resolve symlinks and I think should be more robust
overall.
I also removed the initial stat of /dev/disk/by-uuid, I believe
`ioutil.Readdir` will correctly return an error if the path does not exist.
Signed-off-by: Ian Campbell <ijc@docker.com>
2017-09-27 16:17:57 +01:00
Abhinandan Prativadi
66693196ac
Setting timestamp for cpu and memory stats in nano seconds
...
Signed-off-by: Abhinandan Prativadi <abhi@docker.com>
2017-09-27 07:06:25 -07:00
Phil Estes
b24acea276
Merge pull request #1565 from allencloud/fix-potential-panic
...
fix a potential panic when map is nil
2017-09-27 09:50:30 -04:00
Allen Sun
382dafefc0
fix a potential panic when map is nil
...
Signed-off-by: Allen Sun <shlallen1990@gmail.com>
2017-09-27 13:59:37 +08:00
Lantao Liu
0e6e593481
Merge pull request #275 from mikebrow/config-for-containerd
...
Adds support for configuring the containerd runtime engine
2017-09-26 20:04:13 -07:00
Mike Brown
d8a3c6b018
adds support for configuring the containerd runtime engine
...
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
2017-09-26 20:22:51 -05:00
Lantao Liu
e7a5001c3e
Merge pull request #265 from abhinandanpb/metrics
...
Adding container metrics support
2017-09-26 13:57:17 -07:00
Lantao Liu
78190d6228
Merge pull request #284 from abhinandanpb/master
...
Ansible Cleanup: Combining few tasks into one
2017-09-26 13:23:17 -07:00
Abhinandan Prativadi
0ee33fda03
Combining few tasks into one
...
Signed-off-by: Abhinandan Prativadi <abhi@docker.com>
2017-09-26 12:12:00 -07:00
Abhinandan Prativadi
853804bd8e
Adding integration test for container stats
...
Signed-off-by: Abhinandan Prativadi <abhi@docker.com>
2017-09-26 12:03:15 -07:00
Abhinandan Prativadi
d0298944eb
Adding container metrics
...
Signed-off-by: Abhinandan Prativadi <abhi@docker.com>
2017-09-26 12:03:08 -07:00
Phil Estes
cc9f58ac24
Merge pull request #1559 from mlaventure/fix-oor-panic
...
client: Prevent Out-Of-Range panic in task.Metrics()
2017-09-26 14:39:39 -04:00
Abhinandan Prativadi
b23165cb29
Merge pull request #282 from Random-Liu/fix-ansible-playbook
...
Improve ansible playbook.
2017-09-26 10:49:21 -07:00
Kenfe-Mickaël Laventure
cee13ebfc0
Merge pull request #1557 from crosbymichael/console-bump
...
Update console dep to 84eeaae905fa414d03e07bcd6c8d
2017-09-26 09:59:54 -07:00