9869ff489e
Merge pull request #1233 from runcom/lock-1.8
...
[release-1.8] lib,oci: drop stateLock when possible
2018-01-05 18:38:38 -08:00
77fb62e350
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-18 17:44:57 +01:00
912754b551
Merge pull request #1226 from runcom/sys-cont-1.8
...
[release-1.8] contrib: import system containers
2017-12-15 08:58:43 -08:00
7d945a9f73
contrib: import system containers
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2017-12-14 21:54:29 +01:00
fd78dea270
Merge pull request #1211 from mrunalp/v1.8.4
...
v1.8.4
2017-12-11 15:55:47 +01:00
77a5223357
version: bump to v1.8.5-dev
...
Signed-off-by: Mrunal Patel <mrunalp@gmail.com>
2017-12-10 10:51:07 -08:00
dffb5c27d3
version: Bump to v1.8.4
...
Signed-off-by: Mrunal Patel <mrunalp@gmail.com>
2017-12-10 10:50:30 -08:00
6cc35bf46c
Merge pull request #1209 from runcom/fix-exec-1.8
...
[release-1.8] container_exec: fix terminal true process json
2017-12-10 06:49:37 -06:00
765421be03
container_exec: fix terminal true process json
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2017-12-09 03:52:30 +01:00
2e0284f1f8
Merge pull request #1199 from runcom/list-sandboxes-refactor-1.8
...
[release-1.8] libkpod: sandbox: refactor to memory store
2017-12-01 14:50:27 -08:00
b8de39dbe7
lib: sandbox: refactor to memory store
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2017-12-01 18:14:46 +01:00
8407f7f6d1
Merge pull request #1195 from runcom/bump-v1.8.3
...
Bump v1.8.3
2017-11-30 12:54:10 -10:00
8867460285
version: bump to v1.8.4-dev
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2017-11-30 22:15:04 +01:00
d9922a9db4
version: bump to v1.8.3
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2017-11-30 22:14:46 +01:00
1878765711
Merge pull request #1191 from runcom/fix-apparmor-1.8
...
[release-1.8] container_create: fix apparmor from container config
2017-11-30 08:56:07 -10:00
6a9c6b182e
Merge pull request #1188 from runcom/fixups-env-1.8
...
[release-1.8] Fix env handling on exec
2017-11-30 08:55:07 -10:00
b2ea67f50b
container_create: fix apparmor from container config
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2017-11-30 16:12:44 +01:00
17ec00c5d1
test: add exec/execsync env conflict test
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2017-11-30 12:54:07 +01:00
bb327bc3a0
container_create: correctly set image and kube envs
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2017-11-30 12:01:57 +01:00
4cde515268
oci: do not append conmon env to container process
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2017-11-30 11:26:49 +01:00
99b3e82faf
container_exec: use process file with runc exec
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2017-11-30 11:26:42 +01:00
171e312875
Merge pull request #1180 from runcom/fix-image-pull
...
[release-1.8] Fix image pull
2017-11-28 12:47:01 -10:00
2438f48256
version: bump to v1.8.3-dev
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2017-11-28 12:59:54 +01:00
3de7ab4c09
version: bump to v1.8.2
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2017-11-28 12:59:53 +01:00
fe8c42344c
image_pull: fix image resolver
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2017-11-28 12:59:48 +01:00
b9ddd25592
Merge pull request #1169 from mrunalp/pid_ns
...
share pid namespace for Pod container
2017-11-22 05:34:51 -10:00
d6ebe5d48c
Merge pull request #1174 from runcom/fix-cve-1.8
...
[release-1.8] Add /proc/scsi to masked paths
2017-11-22 09:59:58 -05:00
fc18f2ba35
version: bump v1.8.2-dev
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2017-11-22 12:31:08 +01:00
32d1708dcb
version: bump v1.8.1
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2017-11-22 12:30:50 +01:00
28b0e8d685
Add /proc/scsi to masked paths
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2017-11-22 12:26:47 +01:00
3ad5a156bb
share pid namespace for Pod container
...
Signed-off-by: Wei Wei <weiwei.inf@gmail.com>
Make pid namespace sharing optional and disabled by default
We reverse the logic so that pid ns sharing is disabled by default.
Signed-off-by: Mrunal Patel <mrunalp@gmail.com>
2017-11-20 16:38:43 -08:00
e82298e677
Merge pull request #1155 from mrunalp/add_kube_var_1.8
...
test: Add a version var for kube branches
2017-11-14 18:55:07 -10:00
01425b1e80
test: Add a version var for kube branches
...
This allows us to cache a k8s branch for cri-o 1.0 branch
while allowing overriding of k8s branch in master and other
newer cri-o branches.
Signed-off-by: Mrunal Patel <mrunalp@gmail.com>
2017-11-14 14:29:12 -08:00
80f54bc14d
version: bump v1.8.0
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2017-11-12 01:54:20 +01:00
99e8676967
container_list: guard against list filter being nil
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2017-11-12 01:54:20 +01:00
e99a78edff
*: add crictl.yaml
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2017-11-12 01:54:19 +01:00
33f699bad4
server: validate labels size to avoid dos
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2017-11-12 01:54:19 +01:00
befd719812
Revert "Merge pull request #654 from nalind/storage-update"
...
This reverts commit 4c06116c18c5e73ba65f
2017-11-12 01:54:19 +01:00
98f7591d5f
Merge pull request #1132 from sak0/dev
...
allow update running/created container.
2017-11-12 01:51:04 +01:00
a7f919f071
allow update running/created container.
...
Signed-off-by: CuiHaozhi <cuihaozhi@chinacloud.com.cn>
2017-11-11 11:04:07 -05:00
56eb473aaa
Merge pull request #1139 from runcom/close-img
...
pkg: storage: image: close image after using it
2017-11-10 05:15:52 -10:00
e9200aacba
Merge pull request #1110 from edsantiago/more_testing_fixes
...
Various test-scaffolding fixes
2017-11-10 08:22:06 -05:00
4f4e228274
pkg: storage: image: close image after using it
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2017-11-10 14:21:22 +01:00
4fb52c2b12
Merge pull request #1133 from runcom/prom-runtime-metrics
...
server: add prometheus metrics for CRI operations
2017-11-10 07:30:59 -05:00
71d2131c8c
Merge pull request #1138 from runcom/fix-image-policy
...
image_pull: repull when image ID (config digest) changed
2017-11-10 05:28:07 -05:00
8611c2dfef
image_pull: repull when image ID (config digest) changed
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2017-11-09 19:46:55 +01:00
190650ecca
Merge pull request #1131 from nalind/update-tar-split
...
Bump github.com/vbatts/tar-split
2017-11-09 18:43:36 +01:00
b959f8996d
server: add prometheus metrics for CRI operations
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2017-11-09 16:51:00 +01:00
7d9a89e3a7
Bump github.com/vbatts/tar-split
...
Update vendor/github.com/vbatts/tar-split to v0.10.2, to fix
CVE-2017-14992, per https://github.com/vbatts/tar-split/pull/42 .
Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
2017-11-09 09:16:34 -05:00
9d3c442b7b
Merge pull request #1130 from cevich/fix_clone_k8s_two
...
Fix Local modifications exist in repository
2017-11-09 14:50:18 +01:00
Mrunal Patel