summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-04-13 20:44:36 +0000
committerGerrit Code Review <review@openstack.org>2015-04-13 20:44:36 +0000
commit4a23484a96133cf13f8a6399848dccf07f0ea54d (patch)
treeb8e73929eed9b56ecb3a3555a945ee899cd9e8a8
parent8edfda14f5f60461bc1c661ca050b4b2da60bdac (diff)
parentabed334dbe63608ee3d89749407102df19390f4f (diff)
downloadkolla-4a23484a96133cf13f8a6399848dccf07f0ea54d.tar.gz
kolla-4a23484a96133cf13f8a6399848dccf07f0ea54d.zip
Merge "Changes Default Image Prefix"
-rw-r--r--docs/image-building.md10
-rwxr-xr-xtools/build-docker-image2
2 files changed, 6 insertions, 6 deletions
diff --git a/docs/image-building.md b/docs/image-building.md
index 5e8ad3cc1..a67f3da08 100644
--- a/docs/image-building.md
+++ b/docs/image-building.md
@@ -17,14 +17,14 @@ In general, you will build images like this:
$ ./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:
$ git rev-parse HEAD
76a16029006a2f5d3b79f1198d81acb6653110e9
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
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`
commands:
- $ docker run kollaglue/fedora-rdo-keystone:76a1602
+ $ docker run kollaglue/centos-rdo-keystone:76a1602
## 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:
NAMESPACE=larsks
- PREFIX=centos-rdo-
+ PREFIX=fedora-rdo-
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.
diff --git a/tools/build-docker-image b/tools/build-docker-image
index 852c2dbf4..adffdf875 100755
--- a/tools/build-docker-image
+++ b/tools/build-docker-image
@@ -5,7 +5,7 @@ IMGDIR="$(cd "$(dirname "$0")" && pwd)"
RELEASE_NAMESPACE=kollaglue
NAMESPACE=kollaglue
-PREFIX=fedora-rdo-
+PREFIX=centos-rdo-
TAG=$(git rev-parse --short HEAD)
usage () {