summaryrefslogtreecommitdiff
path: root/docker/cinder
diff options
context:
space:
mode:
authorLars Kellogg-Stedman <lars@redhat.com>2014-10-03 16:20:18 -0400
committerLars Kellogg-Stedman <lars@redhat.com>2014-10-04 11:03:39 -0400
commit24b6db92bc5cf56a5e2c1da3481ee57bddba7c80 (patch)
tree5a2473f302db43d4ddf329f1cc9a38d1c87b0ec6 /docker/cinder
parent9ce465d544cfecb7f96e7b453d7ad567775da648 (diff)
downloadkolla-24b6db92bc5cf56a5e2c1da3481ee57bddba7c80.tar.gz
kolla-24b6db92bc5cf56a5e2c1da3481ee57bddba7c80.zip
introduce a new build mechanism
This patch replaces the collection of individual "build" scripts with a single script (tools/build-docker-image), made available as "build" inside each image directory. The build-docker-image script will, by default, build images tagged with the current commit id in order to prevent developers from accidentally stepping on each other or on release images. Documentation in docs/image-building.md describes the script in more detail. Change-Id: I444d5c2256a85223f8750a0904cb4b07f18ab67f
Diffstat (limited to 'docker/cinder')
l---------[-rwxr-xr-x]docker/cinder/build3
-rwxr-xr-xdocker/cinder/push2
2 files changed, 1 insertions, 4 deletions
diff --git a/docker/cinder/build b/docker/cinder/build
index 66081e4e0..d2accf7d3 100755..120000
--- a/docker/cinder/build
+++ b/docker/cinder/build
@@ -1,2 +1 @@
-#!/bin/bash
-docker build --tag kollaglue/fedora-rdo-cinder .
+../../tools/build-docker-image \ No newline at end of file
diff --git a/docker/cinder/push b/docker/cinder/push
deleted file mode 100755
index 58795abb0..000000000
--- a/docker/cinder/push
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/bash
-docker push kollaglue/fedora-rdo-cinder .