From 7439ddf4846eb1be17cecec889aaf52d3113e1ae Mon Sep 17 00:00:00 2001 From: wangxiyuan Date: Wed, 28 Jun 2017 16:13:12 +0800 Subject: [PATCH] Fix some doc issue There are some doc nits in standalone guide. This patch fixes them. Change-Id: Iaad1448caa55f99c86f1d6ba85e7af251e33fa47 --- contrib/block-box/Makefile | 2 +- contrib/block-box/README.md | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/contrib/block-box/Makefile b/contrib/block-box/Makefile index c0c79fa8da7..ca173ccd9be 100644 --- a/contrib/block-box/Makefile +++ b/contrib/block-box/Makefile @@ -6,7 +6,7 @@ TAG ?= latest all: base lvm devbox base: - docker build https://git.openstack.org/openstack/loci-cinder.git\#:$(PLATFORM) --tag cinder:$(TAG) --build-arg PROJECT_REF="stable/ocata" + docker build https://git.openstack.org/openstack/loci-cinder.git\#:$(PLATFORM) --tag cinder:$(TAG) --build-arg PROJECT_REF=$(CINDER_BRANCH) lvm: docker build -t cinder-lvm -f ./docker_files/Dockerfile.cinder-lvm . diff --git a/contrib/block-box/README.md b/contrib/block-box/README.md index fe1bd6dac61..c23db0591e1 100644 --- a/contrib/block-box/README.md +++ b/contrib/block-box/README.md @@ -36,9 +36,9 @@ You can also build an image to run LVM (**NOTE**: This is dependent on the base ```make lvm``` Finally the last image is a devenv image that will mount the cinder repo you've -checked out into a container and includes test-requirements. +checked out into a container and includes test-requirements: -```make base``` +```make devbox``` For more information and options, check out the openstack/loci page on [github](https://github.com/openstack/loci). @@ -64,7 +64,7 @@ packages installed like LVM2 and iSCSI target driver. Each Cinder service has an executable entrypoint at /usr/local/bin. **NOTE** If you choose to build images from something other than the default Debian -base, you'll need to modify the Dockerfile for this image as well. +base, you'll need to modify the Makefile for this image as well. ### cinder-lvm This is a special image that is built from the base cinder image and adds the