From b1f234154a8430652d805d3846bd851564798ac8 Mon Sep 17 00:00:00 2001 From: Charlie Drage Date: Fri, 25 Aug 2017 10:40:59 -0400 Subject: [PATCH] Update to lowercase in conversion.md Makes the table a little less clustered with lowercase abbreviations. --- docs/conversion.md | 102 ++++++++++++++++++++++----------------------- 1 file changed, 51 insertions(+), 51 deletions(-) diff --git a/docs/conversion.md b/docs/conversion.md index eb18bfe2..28baf7ae 100644 --- a/docs/conversion.md +++ b/docs/conversion.md @@ -10,84 +10,84 @@ __Glossary:__ - __✓:__ Converts - __-:__ Not in this Docker Compose Version -- __N:__ Not yet implemented -- __X:__ Not applicable / no 1-1 conversion +- __n:__ Not yet implemented +- __x:__ Not applicable / no 1-1 conversion | Keys | V1 | V2 | V3 | Kubernetes / OpenShift | Notes | |------------------------|----|----|----|-------------------------------------------------------------|----------------------------------------------------------------------------------------------------------------| -| build | ✓ | ✓ | N | | Builds/Pushes to Docker repository. See `--build` parameter | -| build: context | ✓ | ✓ | N | | | -| build: dockerfile | ✓ | ✓ | N | | | -| build: args | N | N | N | | | -| build: cache_from | - | - | N | | | +| build | ✓ | ✓ | n | | Builds/Pushes to Docker repository. See `--build` parameter | +| build: context | ✓ | ✓ | n | | | +| build: dockerfile | ✓ | ✓ | n | | | +| build: args | n | n | n | | | +| build: cache_from | - | - | n | | | | cap_add, cap_drop | ✓ | ✓ | ✓ | Pod.Spec.Container.SecurityContext.Capabilities.Add/Drop | | | command | ✓ | ✓ | ✓ | Pod.Spec.Container.Command | | -| configs | N | N | N | | | -| configs: short-syntax | N | N | N | | | -| configs: long-syntax | N | N | N | | | -| cgroup_parent | X | X | X | | Not supported within Kubernetes. See issue https://github.com/kubernetes/kubernetes/issues/11986 | +| configs | n | n | n | | | +| configs: short-syntax | n | n | n | | | +| configs: long-syntax | n | n | n | | | +| cgroup_parent | x | x | x | | Not supported within Kubernetes. See issue https://github.com/kubernetes/kubernetes/issues/11986 | | container_name | ✓ | ✓ | ✓ | Metadata.Name + Deployment.Spec.Containers.Name | | -| credential_spec | X | X | X | | Only applicable to Windows containers | +| credential_spec | x | x | x | | Only applicable to Windows containers | | deploy | - | - | ✓ | | | | deploy: mode | - | - | ✓ | | | | deploy: replicas | - | - | ✓ | Deployment.Spec.Replicas / DeploymentConfig.Spec.Replicas | | -| deploy: placement | - | - | N | | | -| deploy: update_config | - | - | N | | | +| deploy: placement | - | - | n | | | +| deploy: update_config | - | - | n | | | | deploy: resources | - | - | ✓ | Containers.Resources.Limits.Memory | Support for memory but not CPU | | deploy: restart_policy | - | - | ✓ | Pod generation | This generated a Pod, see the [user guide on restart](http://kompose.io/user-guide/#restart) | -| deploy: labels | - | - | N | | | -| devices | X | X | X | | Not supported within Kubernetes, See issue https://github.com/kubernetes/kubernetes/issues/5607 | -| depends_on | X | X | X | | | -| dns | X | X | X | | Not used within Kubernetes. Kubernetes uses a managed DNS server | -| dns_search | X | X | X | | See `dns` key | +| deploy: labels | - | - | n | | | +| devices | x | x | x | | Not supported within Kubernetes, See issue https://github.com/kubernetes/kubernetes/issues/5607 | +| depends_on | x | x | x | | | +| dns | x | x | x | | Not used within Kubernetes. Kubernetes uses a managed DNS server | +| dns_search | x | x | x | | See `dns` key | | tmpfs | ✓ | ✓ | ✓ | Pod.Spec.Containers.Volumes.EmptyDir | Creates emptyDirvolume with medium set to Memory & mounts given directory inside container | | entrypoint | ✓ | ✓ | ✓ | Pod.Spec.Container.Command | Same as command | -| env_file | N | N | N | | | +| env_file | n | n | n | | | | environment | ✓ | ✓ | ✓ | Pod.Spec.Container.Env | | | expose | ✓ | ✓ | ✓ | Service.Spec.Ports | | | extends | ✓ | ✓ | ✓ | | Extends by utilizing the same image supplied | -| external_links | X | X | X | | Kubernetes uses a flat-structure for all containers and thus external_links does not have a 1-1 conversion | -| extra_hosts | N | N | N | | | +| external_links | x | x | x | | Kubernetes uses a flat-structure for all containers and thus external_links does not have a 1-1 conversion | +| extra_hosts | n | n | n | | | | group_add | ✓ | ✓ | ✓ | | | -| healthcheck | - | N | ✓ | | | +| healthcheck | - | n | ✓ | | | | image | ✓ | ✓ | ✓ | Deployment.Spec.Containers.Image | | -| isolation | X | X | X | | Not applicable as this applies to Windows with HyperV support | +| isolation | x | x | x | | Not applicable as this applies to Windows with HyperV support | | labels | ✓ | ✓ | ✓ | Metadata.Annotations | | -| links | X | X | x | | All containers in the same pod are accessible in Kubernetes | -| logging | X | x | X | | Kubernetes has built-in logging support at the node-level | -| network_mode | X | X | X | | Kubernetes uses it's own cluster networking | -| networks | X | X | X | | See `networks` key | -| networks: aliases | X | X | X | | See `networks` key | -| networks: addresses | X | X | X | | See `networks` key | +| links | x | x | x | | All containers in the same pod are accessible in Kubernetes | +| logging | x | x | x | | Kubernetes has built-in logging support at the node-level | +| network_mode | x | x | x | | Kubernetes uses it's own cluster networking | +| networks | x | x | x | | See `networks` key | +| networks: aliases | x | x | x | | See `networks` key | +| networks: addresses | x | x | x | | See `networks` key | | pid | ✓ | ✓ | ✓ | Pod.Spec.HostPID | | | ports | ✓ | ✓ | ✓ | Service.Spec.Ports | | | ports: short-syntax | ✓ | ✓ | ✓ | Service.Spec.Ports | | | ports: long-syntax | - | - | ✓ | Service.Spec.Ports | | -| secrets | - | - | N | | | -| secrets: short-syntax | - | - | N | | | -| secrets: long-syntax | - | - | N | | | -| security_opt | X | X | X | | Kubernetes uses it's own container naming scheme | +| secrets | - | - | n | | | +| secrets: short-syntax | - | - | n | | | +| secrets: long-syntax | - | - | n | | | +| security_opt | x | x | x | | Kubernetes uses it's own container naming scheme | | stop_grace_period | ✓ | ✓ | ✓ | Pod.Spec.TerminationGracePeriodSeconds | | -| stop_signal | X | X | X | | Not supported within Kubernetes. See issue https://github.com/kubernetes/kubernetes/issues/30051 | -| sysctls | N | N | N | | | -| ulimits | X | X | X | | Not supported within Kubernetes. See issue https://github.com/kubernetes/kubernetes/issues/3595 | -| userns_mode | X | X | X | | Not supported within Kubernetes and ignored in Docker Compose Version 3 | +| stop_signal | x | x | x | | Not supported within Kubernetes. See issue https://github.com/kubernetes/kubernetes/issues/30051 | +| sysctls | n | n | n | | | +| ulimits | x | x | x | | Not supported within Kubernetes. See issue https://github.com/kubernetes/kubernetes/issues/3595 | +| userns_mode | x | x | x | | Not supported within Kubernetes and ignored in Docker Compose Version 3 | | volumes | ✓ | ✓ | ✓ | PersistentVolumeClaim | Creates a PersistentVolumeClaim. Can only be created if there is already a PersistentVolume within the cluster | | volumes: short-syntax | ✓ | ✓ | ✓ | PersistentVolumeClaim | Creates a PersistentVolumeClaim. Can only be created if there is already a PersistentVolume within the cluster | | volumes: long-syntax | - | - | ✓ | PersistentVolumeClaim | Creates a PersistentVolumeClaim. Can only be created if there is already a PersistentVolume within the cluster | | restart | ✓ | ✓ | ✓ | | | | | | | | | | -| __Volume__ | X | X | X | | | -| driver | X | X | X | | | -| driver_opts | X | X | X | | | -| external | X | X | X | | | -| labels | X | X | X | | | +| __Volume__ | x | x | x | | | +| driver | x | x | x | | | +| driver_opts | x | x | x | | | +| external | x | x | x | | | +| labels | x | x | x | | | | | | | | | | -| __Network__ | X | X | X | | | -| driver | X | X | X | | | -| driver_opts | X | X | X | | | -| enable_ipv6 | X | X | X | | | -| ipam | X | X | X | | | -| internal | X | X | X | | | -| labels | X | X | X | | | -| external | X | X | X | | | +| __Network__ | x | x | x | | | +| driver | x | x | x | | | +| driver_opts | x | x | x | | | +| enable_ipv6 | x | x | x | | | +| ipam | x | x | x | | | +| internal | x | x | x | | | +| labels | x | x | x | | | +| external | x | x | x | | |