From 687929a32e4243acc63bf37d9d2394cd3828acd5 Mon Sep 17 00:00:00 2001 From: Rolf Neugebauer Date: Wed, 30 Aug 2017 13:53:58 +0100 Subject: [PATCH] blueprints: rename docker-17.06-ce.yml to docker-ce.yml Also fix up the corresponding test. Signed-off-by: Rolf Neugebauer --- blueprints/README.md | 4 ++-- .../docker-for-mac/{docker-17.06-ce.yml => docker-ce.yml} | 0 .../cases/000_build/200_blueprints/010_docker_for_mac/test.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) rename blueprints/docker-for-mac/{docker-17.06-ce.yml => docker-ce.yml} (100%) diff --git a/blueprints/README.md b/blueprints/README.md index cebbae73a..b3f667d83 100644 --- a/blueprints/README.md +++ b/blueprints/README.md @@ -24,10 +24,10 @@ the [examples/](../examples/) directory. An initial blueprint for the open source components of Docker for Mac is available in [docker-for-mac](docker-for-mac). The blueprint has support for controlling `dockerd` from the host via `vsudd` and port forwarding with VPNKit. It requires HyperKit, VPNKit and a Docker client on the host to run. The easiest way to install these at the moment is to install a recent version of Docker for Mac. -To build it with Docker 17.06: +To build it with the latest Docker CE: ``` -$ moby build -name docker-for-mac base.yml docker-17.06-ce.yml +$ moby build -name docker-for-mac base.yml docker-ce.yml ``` To run the VM with a 500M disk: diff --git a/blueprints/docker-for-mac/docker-17.06-ce.yml b/blueprints/docker-for-mac/docker-ce.yml similarity index 100% rename from blueprints/docker-for-mac/docker-17.06-ce.yml rename to blueprints/docker-for-mac/docker-ce.yml diff --git a/test/cases/000_build/200_blueprints/010_docker_for_mac/test.sh b/test/cases/000_build/200_blueprints/010_docker_for_mac/test.sh index 61827538d..892ca0fed 100644 --- a/test/cases/000_build/200_blueprints/010_docker_for_mac/test.sh +++ b/test/cases/000_build/200_blueprints/010_docker_for_mac/test.sh @@ -18,7 +18,7 @@ clean_up() { trap clean_up EXIT # Test code goes here -moby build -name "${IMAGE_NAME}" "${LINUXKIT_BLUEPRINTS_DIR}/${IMAGE_NAME}/base.yml" "${LINUXKIT_BLUEPRINTS_DIR}/${IMAGE_NAME}/docker-17.06-ce.yml" +moby build -name "${IMAGE_NAME}" "${LINUXKIT_BLUEPRINTS_DIR}/${IMAGE_NAME}/base.yml" "${LINUXKIT_BLUEPRINTS_DIR}/${IMAGE_NAME}/docker-ce.yml" exit 0