summaryrefslogtreecommitdiff
path: root/docker/nova-compute
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/nova-compute
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/nova-compute')
-rwxr-xr-xdocker/nova-compute/build2
l---------[-rwxr-xr-x]docker/nova-compute/nova-base/build3
-rwxr-xr-xdocker/nova-compute/nova-base/push2
l---------[-rwxr-xr-x]docker/nova-compute/nova-compute/build3
-rwxr-xr-xdocker/nova-compute/nova-compute/push2
l---------[-rwxr-xr-x]docker/nova-compute/nova-libvirt/build3
-rwxr-xr-xdocker/nova-compute/nova-libvirt/push2
-rwxr-xr-xdocker/nova-compute/push2
8 files changed, 3 insertions, 16 deletions
diff --git a/docker/nova-compute/build b/docker/nova-compute/build
deleted file mode 100755
index 2c0ff1588..000000000
--- a/docker/nova-compute/build
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/bash
-docker build --tag kollaglue/fedora-rdo-nova-compute .
diff --git a/docker/nova-compute/nova-base/build b/docker/nova-compute/nova-base/build
index 266c59185..43944faa0 100755..120000
--- a/docker/nova-compute/nova-base/build
+++ b/docker/nova-compute/nova-base/build
@@ -1,2 +1 @@
-#!/bin/bash
-docker build --tag kollaglue/fedora-rdo-nova-base .
+../../../tools/build-docker-image \ No newline at end of file
diff --git a/docker/nova-compute/nova-base/push b/docker/nova-compute/nova-base/push
deleted file mode 100755
index ea92f760c..000000000
--- a/docker/nova-compute/nova-base/push
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/bash
-docker push kollaglue/fedora-rdo-nova-base .
diff --git a/docker/nova-compute/nova-compute/build b/docker/nova-compute/nova-compute/build
index 2c0ff1588..43944faa0 100755..120000
--- a/docker/nova-compute/nova-compute/build
+++ b/docker/nova-compute/nova-compute/build
@@ -1,2 +1 @@
-#!/bin/bash
-docker build --tag kollaglue/fedora-rdo-nova-compute .
+../../../tools/build-docker-image \ No newline at end of file
diff --git a/docker/nova-compute/nova-compute/push b/docker/nova-compute/nova-compute/push
deleted file mode 100755
index 5fe18cb3b..000000000
--- a/docker/nova-compute/nova-compute/push
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/bash
-docker push kollaglue/fedora-rdo-nova-compute .
diff --git a/docker/nova-compute/nova-libvirt/build b/docker/nova-compute/nova-libvirt/build
index ec01bd27d..43944faa0 100755..120000
--- a/docker/nova-compute/nova-libvirt/build
+++ b/docker/nova-compute/nova-libvirt/build
@@ -1,2 +1 @@
-#!/bin/bash
-docker build --tag kollaglue/fedora-rdo-nova-libvirt .
+../../../tools/build-docker-image \ No newline at end of file
diff --git a/docker/nova-compute/nova-libvirt/push b/docker/nova-compute/nova-libvirt/push
deleted file mode 100755
index 604e44afd..000000000
--- a/docker/nova-compute/nova-libvirt/push
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/bash
-docker push kollaglue/fedora-rdo-nova-libvirt .
diff --git a/docker/nova-compute/push b/docker/nova-compute/push
deleted file mode 100755
index 5fe18cb3b..000000000
--- a/docker/nova-compute/push
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/bash
-docker push kollaglue/fedora-rdo-nova-compute .