From 24b6db92bc5cf56a5e2c1da3481ee57bddba7c80 Mon Sep 17 00:00:00 2001
From: Lars Kellogg-Stedman <lars@redhat.com>
Date: Fri, 3 Oct 2014 16:20:18 -0400
Subject: 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
---
 docker/glance/build                 | 10 ----------
 docker/glance/glance-api/build      |  3 +--
 docker/glance/glance-api/push       |  2 --
 docker/glance/glance-base/build     |  3 +--
 docker/glance/glance-base/push      |  2 --
 docker/glance/glance-registry/build |  3 +--
 docker/glance/glance-registry/push  |  2 --
 docker/glance/push                  | 10 ----------
 8 files changed, 3 insertions(+), 32 deletions(-)
 delete mode 100755 docker/glance/build
 mode change 100755 => 120000 docker/glance/glance-api/build
 delete mode 100755 docker/glance/glance-api/push
 mode change 100755 => 120000 docker/glance/glance-base/build
 delete mode 100755 docker/glance/glance-base/push
 mode change 100755 => 120000 docker/glance/glance-registry/build
 delete mode 100755 docker/glance/glance-registry/push
 delete mode 100755 docker/glance/push

(limited to 'docker/glance')

diff --git a/docker/glance/build b/docker/glance/build
deleted file mode 100755
index 7f0534c18..000000000
--- a/docker/glance/build
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-
-for image in glance-base glance-api glance-registry; do
-(
-	pushd $image
-	./build
-        popd
-)
-done
-
diff --git a/docker/glance/glance-api/build b/docker/glance/glance-api/build
deleted file mode 100755
index 88434b114..000000000
--- a/docker/glance/glance-api/build
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/bash
-docker build --tag kollaglue/fedora-rdo-glance-api .
diff --git a/docker/glance/glance-api/build b/docker/glance/glance-api/build
new file mode 120000
index 000000000..43944faa0
--- /dev/null
+++ b/docker/glance/glance-api/build
@@ -0,0 +1 @@
+../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/glance/glance-api/push b/docker/glance/glance-api/push
deleted file mode 100755
index 6c1edacbe..000000000
--- a/docker/glance/glance-api/push
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/bash
-docker push kollaglue/fedora-rdo-glance-api .
diff --git a/docker/glance/glance-base/build b/docker/glance/glance-base/build
deleted file mode 100755
index 75a42b8a0..000000000
--- a/docker/glance/glance-base/build
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/bash
-docker build --tag kollaglue/fedora-rdo-glance-base .
diff --git a/docker/glance/glance-base/build b/docker/glance/glance-base/build
new file mode 120000
index 000000000..43944faa0
--- /dev/null
+++ b/docker/glance/glance-base/build
@@ -0,0 +1 @@
+../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/glance/glance-base/push b/docker/glance/glance-base/push
deleted file mode 100755
index 3de87a26c..000000000
--- a/docker/glance/glance-base/push
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/bash
-docker push kollaglue/fedora-rdo-glance-base .
diff --git a/docker/glance/glance-registry/build b/docker/glance/glance-registry/build
deleted file mode 100755
index 47e88f5ef..000000000
--- a/docker/glance/glance-registry/build
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/bash
-docker build --tag kollaglue/fedora-rdo-glance-registry .
diff --git a/docker/glance/glance-registry/build b/docker/glance/glance-registry/build
new file mode 120000
index 000000000..43944faa0
--- /dev/null
+++ b/docker/glance/glance-registry/build
@@ -0,0 +1 @@
+../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/glance/glance-registry/push b/docker/glance/glance-registry/push
deleted file mode 100755
index f69cca5a1..000000000
--- a/docker/glance/glance-registry/push
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/bash
-docker push kollaglue/fedora-rdo-glance-registry .
diff --git a/docker/glance/push b/docker/glance/push
deleted file mode 100755
index daadc4937..000000000
--- a/docker/glance/push
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-
-for image in glance-base glance-api glance-registry; do
-(
-	pushd $image
-	./push
-	popd
-)
-done
-
-- 
cgit v1.2.3