From ca46d6a83b718ccd6d1947f320bc9775d327a4ba Mon Sep 17 00:00:00 2001 From: Charlie Drage Date: Fri, 18 Aug 2017 11:40:17 -0400 Subject: [PATCH] Update conversion matrix with windows notes Moves one of the notes as well as updates credentials_spec --- docs/conversion.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/conversion.md b/docs/conversion.md index 6ad6d05b..6cf9d489 100644 --- a/docs/conversion.md +++ b/docs/conversion.md @@ -15,7 +15,7 @@ __Glossary:__ | Keys | V1 | V2 | V3 | Kubernetes / OpenShift | Notes | |------------------------|----|----|----|-------------------------------------------------------------|----------------------------------------------------------------------------------------------------------------| -| build | ✓ | ✓ | N | Builds/Pushes to Docker repository. See `--build` parameter | Only supported on Version 1/2 of Docker Compose | +| build | ✓ | ✓ | N | | Builds/Pushes to Docker repository. See `--build` parameter | | build: context | ✓ | ✓ | N | | | | build: dockerfile | ✓ | ✓ | N | | | | build: args | N | N | N | | | @@ -27,7 +27,7 @@ __Glossary:__ | 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 | N | N | N | | | +| credential_spec | X | X | X | | Only applicable to Windows containers | | deploy | - | - | ✓ | | | | deploy: mode | - | - | ✓ | | | | deploy: replicas | - | - | ✓ | Deployment.Spec.Replicas / DeploymentConfig.Spec.Replicas | |