ecc572e7cf
lib,oci: drop stateLock when possible
...
Should fix a possible deadlock in, at least, ListPodSandbox.
There seems to be no reason to hold stateLock when doing operations on
the memory_store for containers and sandboxes.
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2017-12-15 15:31:58 +01:00
2fa1f3f74a
Merge pull request #1221 from runcom/split-critest-from-e2e
...
CI: split critest from e2e
2017-12-13 16:53:20 -08:00
d91df68638
CI: split critest from e2e
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2017-12-14 00:09:36 +01:00
da50e6ca11
Merge pull request #1197 from runcom/sys-cont
...
contrib: import system containers
2017-12-13 09:22:55 -08:00
ebc249cad8
Merge pull request #1214 from runcom/fix-1.10-vendor
...
vendor: bump to kube 1.10/master
2017-12-11 11:14:15 -08:00
f317ffce5b
vendor: bump to kube 1.10/master
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2017-12-11 16:45:48 +01:00
a85ea609db
Merge pull request #1207 from runcom/fix-exec-termianl
...
container_exec: fix terminal true process json
2017-12-07 14:44:38 -08:00
afeab27a36
container_exec: fix terminal true process json
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2017-12-07 20:51:05 +01:00
1f3fbdc987
Merge pull request #1206 from nlacasse/state-ignore-stderr
...
Only parse stdout from "state" command. Ignore stderr.
2017-12-07 11:29:25 -08:00
1138af9e59
Don't parse stderr as json when calling "state" command.
...
Some oci runtimes may used stderr for logging. Cri-o should not try to
parse this output as json when calling the "state" command.
Signed-off-by: Nicolas Lacasse <nlacasse@google.com>
2017-12-06 09:52:54 -08:00
06904d4dbb
contrib: import system containers
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2017-12-02 12:24:40 +01:00
85f303f3ff
Merge pull request #1198 from runcom/list-sandboxes-refactor
...
lib: sandbox: refactor to memory store
2017-12-01 11:36:46 -08:00
989d275e76
Merge pull request #1170 from alexandrst88/fix-tutorial
...
Update install.md relevant documentation
2017-12-01 09:20:38 -10:00
d168fc5fec
lib: sandbox: refactor to memory store
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2017-12-01 18:16:08 +01:00
b9ffd277b9
Merge pull request #1192 from runcom/no-libkpod
...
libkpod -> lib rename
2017-12-01 08:44:44 -05:00
910cfab6e9
Merge pull request #910 from sameo/topic/bats
...
test: Add timeout before checking for status
2017-12-01 13:30:13 +01:00
a2e08d5dc4
test: Add timeout before checking for status
...
Under some slow environment (nested VMs) or with some
not as fast runtimes (Clear Containers), asking for a
status right away is racy.
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
2017-12-01 10:21:50 +01:00
0eaa52c356
Merge pull request #1184 from willstudy/unit_test
...
Adding unit tests for server/secrets.go
2017-12-01 10:04:30 +01:00
0ab5e80c38
Merge pull request #1193 from mrunalp/go_1.8.5
...
Bump up go version to 1.8.5
2017-11-30 22:19:34 +01:00
2cae11ba35
Merge pull request #1189 from runcom/fix-apparmor-master
...
container_create: fix apparmor from container config
2017-11-30 08:56:46 -10:00
40da5c2c16
Merge pull request #1186 from runcom/fixups-env-master
...
Fix env handling on exec
2017-11-30 08:54:33 -10:00
b8bba70f99
libkpod -> lib rename
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2017-11-30 17:08:26 +01:00
32d2c2d57c
Bump up go version to 1.8.5
...
Signed-off-by: Mrunal Patel <mrunalp@gmail.com>
2017-11-30 08:02:02 -08:00
c8aad704dd
container_create: fix apparmor from container config
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2017-11-30 16:12:16 +01:00
ea0bf448fe
test: add exec/execsync env conflict test
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2017-11-30 12:54:58 +01:00
902acca4af
container_create: correctly set image and kube envs
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2017-11-30 12:28:50 +01:00
b59f31a2d5
oci: do not append conmon env to container process
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2017-11-30 11:23:42 +01:00
c6f68f1bf1
container_exec: use process file with runc exec
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2017-11-30 11:23:37 +01:00
a71948e9e7
Fixed install.md documentation
...
Signed-off-by: Oleksandr Stepanov <alexandrst88@gmail.com>
2017-11-30 10:38:20 +02:00
6faef13293
Merge pull request #1168 from weiwei04/remove_crioctl
...
remove crioctl source code
2017-11-29 17:06:51 -10:00
b2a78eba2b
Merge pull request #1185 from runcom/fix-runtime-deps
...
README.md: add all runtime dependencies
2017-11-29 05:47:13 -10:00
bae4d2241f
README.md: add all runtime dependencies
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2017-11-29 15:57:17 +01:00
3006a2159a
drop crioctl source code
...
Signed-off-by: Wei Wei <weiwei.inf@gmail.com>
2017-11-29 21:07:50 +08:00
5f5a7a3648
Merge pull request #1162 from mrunalp/add_partial_support
...
conmon: Add support for partial/newline log tags
2017-11-29 11:47:09 +01:00
c0ad5277e6
Adding unit tests for server/secrets.go
...
Signed-off-by: Liu Chang <liuchang@qiniu.com>
2017-11-29 17:42:19 +08:00
d10490bccf
test: Add an integration test for partial line in logs
...
Signed-off-by: Mrunal Patel <mrunalp@gmail.com>
2017-11-28 18:57:26 -08:00
4cf4137be0
conmon: Add support for partial/newline log tags
...
This is for ttps://github.com/kubernetes/kubernetes/pull/55922
Signed-off-by: Mrunal Patel <mrunalp@gmail.com>
2017-11-28 18:57:21 -08:00
4a32d0ff33
Merge pull request #1183 from runcom/fix-image-pull-master
...
image_pull: fix image resolver
2017-11-28 16:49:15 -10:00
87f1ae214f
image_pull: fix image resolver
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2017-11-28 23:53:18 +01:00
63371009ae
Merge pull request #1181 from runcom/remove-git-validation-ci
...
CI: drop git-validation as it's never used
2017-11-28 12:46:35 -10:00
03fb727f2b
CI: drop git-validation as it's never used
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2017-11-28 11:40:06 +01:00
851759c73b
Merge pull request #1179 from willstudy/unit_test
...
Adding unit tests for server/utils.go
2017-11-27 19:34:24 +01:00
8518e06e81
Merge pull request #1166 from willstudy/dev
...
Improve the readability of crio.8.md
2017-11-27 11:08:05 -05:00
42800cc96b
Adding unit tests for server/utils.go
...
Signed-off-by: Liu Chang <liuchang@qiniu.com>
2017-11-27 16:01:00 +08:00
bf515de94d
Improve the readability of crio.8.md
...
Signed-off-by: Liu Chang <liuchang@qiniu.com>
2017-11-27 11:04:09 +08:00
070b8bfdc5
Merge pull request #1176 from runcom/fix-e2e-1.0
...
contrib: parametrize the crio socket for kube
2017-11-22 09:36:15 -10:00
7508cdeace
Merge pull request #1173 from runcom/fix-cve
...
Add /proc/scsi to masked paths
2017-11-22 05:35:33 -10:00
67e2d28c86
Merge pull request #1171 from WeiZhang555/fix-readme
...
Cleanup: remove redundant lines in tutorial
2017-11-22 14:53:44 +01:00
2f344c7533
contrib: parametrize the crio socket for kube
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2017-11-22 14:14:06 +01:00
a75362dca0
Add /proc/scsi to masked paths
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2017-11-22 12:25:43 +01:00
Antonio Murdaca