openstack
/
cinder
Code Issues Proposed changes

Merge "Fix some doc issue"

This commit is contained in:
Jenkins 2017-07-31 16:43:55 +00:00 committed by Gerrit Code Review
parent 32dafa0939 7439ddf484
commit 8b7d700526
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/block-box/Makefile
View File

@ -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 .

6
contrib/block-box/README.md
View File

@ -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