summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authork8s-merge-robot <k8s.production.user@gmail.com>2016-02-09 16:05:01 -0800
committerk8s-merge-robot <k8s.production.user@gmail.com>2016-02-09 16:05:01 -0800
commit294a14390255d0ecc668f55278e3e4b15730ccbb (patch)
tree44aa7a1a715ffc6d5e2b679792b27d83ef2700be
parent71c7690e32ae6e9ecc358b0c6b57ef277d09cece (diff)
parent68f1c720f3f947d2bf5f19c97b04b22438f4417f (diff)
Merge pull request #20896 from kinvolk/ckuehl/replace-rocket-with-rkt
Auto commit by PR queue bot
-rw-r--r--selinux.md4
-rw-r--r--volumes.md8
2 files changed, 6 insertions, 6 deletions
diff --git a/selinux.md b/selinux.md
index 14ce3671..27e4087d 100644
--- a/selinux.md
+++ b/selinux.md
@@ -74,9 +74,9 @@ use-cases:
We should avoid using the `:z` flag, because it relaxes the SELinux context so that any container
(from an SELinux standpoint) can use the volume.
-### Rocket
+### rkt
-Rocket currently reads the base SELinux context to use from `/etc/selinux/*/contexts/lxc_contexts`
+rkt currently reads the base SELinux context to use from `/etc/selinux/*/contexts/lxc_contexts`
and allocates a unique MCS label per pod.
### Kubernetes
diff --git a/volumes.md b/volumes.md
index 059375c4..de6bdf0a 100644
--- a/volumes.md
+++ b/volumes.md
@@ -90,15 +90,15 @@ There is a [proposal](https://github.com/docker/docker/pull/14632) to add a bind
Docker to change the ownership of a volume to the effective UID and GID of a container, but this has
not yet been accepted.
-### Rocket
+### rkt
-Rocket
+rkt
[image manifests](https://github.com/appc/spec/blob/master/spec/aci.md#image-manifest-schema) can
-specify users and groups, similarly to how a Docker image can. A Rocket
+specify users and groups, similarly to how a Docker image can. A rkt
[pod manifest](https://github.com/appc/spec/blob/master/spec/pods.md#pod-manifest-schema) can also
override the default user and group specified by the image manifest.
-Rocket does not currently support supplemental groups or changing the owning UID or
+rkt does not currently support supplemental groups or changing the owning UID or
group of a volume, but it has been [requested](https://github.com/coreos/rkt/issues/1309).
## Use Cases