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/swift/swift-account/build      | 3 +--
 docker/swift/swift-account/push       | 2 --
 docker/swift/swift-base/build         | 3 +--
 docker/swift/swift-base/push          | 2 --
 docker/swift/swift-container/build    | 3 +--
 docker/swift/swift-container/push     | 2 --
 docker/swift/swift-object/build       | 3 +--
 docker/swift/swift-object/push        | 2 --
 docker/swift/swift-proxy-server/build | 3 +--
 docker/swift/swift-proxy-server/push  | 2 --
 10 files changed, 5 insertions(+), 20 deletions(-)
 mode change 100755 => 120000 docker/swift/swift-account/build
 delete mode 100755 docker/swift/swift-account/push
 mode change 100755 => 120000 docker/swift/swift-base/build
 delete mode 100755 docker/swift/swift-base/push
 mode change 100755 => 120000 docker/swift/swift-container/build
 delete mode 100755 docker/swift/swift-container/push
 mode change 100755 => 120000 docker/swift/swift-object/build
 delete mode 100755 docker/swift/swift-object/push
 mode change 100755 => 120000 docker/swift/swift-proxy-server/build
 delete mode 100755 docker/swift/swift-proxy-server/push

(limited to 'docker/swift')

diff --git a/docker/swift/swift-account/build b/docker/swift/swift-account/build
deleted file mode 100755
index 9db06bce9..000000000
--- a/docker/swift/swift-account/build
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/bash
-docker build --tag kollaglue/fedora-rdo-swift-account-server .
diff --git a/docker/swift/swift-account/build b/docker/swift/swift-account/build
new file mode 120000
index 000000000..43944faa0
--- /dev/null
+++ b/docker/swift/swift-account/build
@@ -0,0 +1 @@
+../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/swift/swift-account/push b/docker/swift/swift-account/push
deleted file mode 100755
index e0aad88b9..000000000
--- a/docker/swift/swift-account/push
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/bash
-docker push kollaglue/fedora-rdo-swift-account .
diff --git a/docker/swift/swift-base/build b/docker/swift/swift-base/build
deleted file mode 100755
index b6dd0369b..000000000
--- a/docker/swift/swift-base/build
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/bash
-docker build --tag kollaglue/fedora-rdo-swift-base .
diff --git a/docker/swift/swift-base/build b/docker/swift/swift-base/build
new file mode 120000
index 000000000..43944faa0
--- /dev/null
+++ b/docker/swift/swift-base/build
@@ -0,0 +1 @@
+../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/swift/swift-base/push b/docker/swift/swift-base/push
deleted file mode 100755
index 2f0213c4d..000000000
--- a/docker/swift/swift-base/push
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/bash
-docker push kollaglue/fedora-rdo-swift-base .
diff --git a/docker/swift/swift-container/build b/docker/swift/swift-container/build
deleted file mode 100755
index 949f7ac4c..000000000
--- a/docker/swift/swift-container/build
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/bash
-docker build --tag kollaglue/fedora-rdo-swift-container-server .
diff --git a/docker/swift/swift-container/build b/docker/swift/swift-container/build
new file mode 120000
index 000000000..43944faa0
--- /dev/null
+++ b/docker/swift/swift-container/build
@@ -0,0 +1 @@
+../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/swift/swift-container/push b/docker/swift/swift-container/push
deleted file mode 100755
index a805879a3..000000000
--- a/docker/swift/swift-container/push
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/bash
-docker push kollaglue/fedora-rdo-swift-container .
diff --git a/docker/swift/swift-object/build b/docker/swift/swift-object/build
deleted file mode 100755
index eee05d6a9..000000000
--- a/docker/swift/swift-object/build
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/bash
-docker build --tag kollaglue/fedora-rdo-swift-object-server .
diff --git a/docker/swift/swift-object/build b/docker/swift/swift-object/build
new file mode 120000
index 000000000..43944faa0
--- /dev/null
+++ b/docker/swift/swift-object/build
@@ -0,0 +1 @@
+../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/swift/swift-object/push b/docker/swift/swift-object/push
deleted file mode 100755
index 7f05b6379..000000000
--- a/docker/swift/swift-object/push
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/bash
-docker push kollaglue/fedora-rdo-swift-object .
diff --git a/docker/swift/swift-proxy-server/build b/docker/swift/swift-proxy-server/build
deleted file mode 100755
index 87de199be..000000000
--- a/docker/swift/swift-proxy-server/build
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/bash
-docker build --tag kollaglue/fedora-rdo-swift-proxy-server .
diff --git a/docker/swift/swift-proxy-server/build b/docker/swift/swift-proxy-server/build
new file mode 120000
index 000000000..43944faa0
--- /dev/null
+++ b/docker/swift/swift-proxy-server/build
@@ -0,0 +1 @@
+../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/swift/swift-proxy-server/push b/docker/swift/swift-proxy-server/push
deleted file mode 100755
index 60208c931..000000000
--- a/docker/swift/swift-proxy-server/push
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/bash
-docker push kollaglue/fedora-rdo-swift-proxy .
-- 
cgit v1.2.3