openstack/kolla-ansible
Code Issues Proposed changes

Changes Default Image Prefix

Browse Source 
Previously, Fedora was set as the default image prefix. Since our
reference architecture focuses on CentOS, the default image prefix
has been changed accordingly.

Change-Id: I794ac1aa035d793204fa315752ae8188ce872a3e
This commit is contained in:
Daneyon Hansen 2015-04-13 19:36:24 +00:00
parent 977f2c8243
commit abed334dbe
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
docs/image-building.md
View File

@ -17,14 +17,14 @@ In general, you will build images like this:
$ ./build $ ./build
By default, the above command would build By default, the above command would build
`kollaglue/fedora-rdo-keystone:CID`, where `CID` is the current short `kollaglue/centos-rdo-keystone:CID`, where `CID` is the current short
commit ID. That is, given: commit ID. That is, given:
$ git rev-parse HEAD $ git rev-parse HEAD
76a16029006a2f5d3b79f1198d81acb6653110e9 76a16029006a2f5d3b79f1198d81acb6653110e9
The above command would generate The above command would generate
`kollaglue/fedora-rdo-keystone:76a1602`. This tagging is meant to `kollaglue/centos-rdo-keystone:76a1602`. This tagging is meant to
prevent developers from stepping on each other or on release images prevent developers from stepping on each other or on release images
during the development process. during the development process.
@ -35,7 +35,7 @@ To push the image after building, add `--push`:
To use these images, you must specify the tag in your `docker run` To use these images, you must specify the tag in your `docker run`
commands: commands:
$ docker run kollaglue/fedora-rdo-keystone:76a1602 $ docker run kollaglue/centos-rdo-keystone:76a1602
## Building releases ## Building releases
@ -70,8 +70,8 @@ in the image directory and in the top level of the repository. You
can use this to set defaults, such as: can use this to set defaults, such as:
NAMESPACE=larsks NAMESPACE=larsks
PREFIX=centos-rdo- PREFIX=fedora-rdo-
This setting would cause images to be tagged into the `larsks/` This setting would cause images to be tagged into the `larsks/`
namespace and use CentOS as base image instead of the default Fedora. namespace and use Fedora as base image instead of the default CentOS.

2
tools/build-docker-image
View File

@ -5,7 +5,7 @@ IMGDIR="$(cd "$(dirname "$0")" && pwd)"
RELEASE_NAMESPACE=kollaglue RELEASE_NAMESPACE=kollaglue
NAMESPACE=kollaglue NAMESPACE=kollaglue
PREFIX=fedora-rdo- PREFIX=centos-rdo-
TAG=$(git rev-parse --short HEAD) TAG=$(git rev-parse --short HEAD)
usage () { usage () {