Merge pull request #7 from sdake/master

Provide script to build docker images

20 files changed, 43 insertions, 7 deletions

diff --git a/docker/build b/docker/build
new file mode 100755
index 000000000..56831ba04
--- /dev/null
+++ b/docker/build
@@ -0,0 +1,12 @@
+#!/bin/bash
+# If the directories were numbered, a simple find could be used to build ;-)
+
+CONTAINERS=(fedora-rdo-base cinder glance/glance-base glance/glance-api glance/glance-registry heat/heat-base heat/heat-api heat/heat-engine keystone mariadb rabbitmq swift/swift-base swift/swift-account swift/swift-container swift/swift-object swift/swift-proxy-server)
+
+for IMAGE in ${CONTAINERS[@]}; do
+        echo "Building $IMAGE"
+        pushd .
+        cd ${IMAGE}
+        ./build
+        popd
+done
diff --git a/docker/cinder/build b/docker/cinder/build
new file mode 100755
index 000000000..6a1b9d713
--- /dev/null
+++ b/docker/cinder/build
@@ -0,0 +1,2 @@
+#!/bin/bash
+docker build --tag fedora-rdo-cinder .
diff --git a/docker/fedora-rdo-base/build b/docker/fedora-rdo-base/build
new file mode 100755
index 000000000..918aff44d
--- /dev/null
+++ b/docker/fedora-rdo-base/build
@@ -0,0 +1,2 @@
+#!/bin/bash
+docker build --tag fedora-rdo-base .
diff --git a/docker/glance/glance-api/Dockerfile b/docker/glance/glance-api/Dockerfile
index 382445c00..3d9992a5e 100644
--- a/docker/glance/glance-api/Dockerfile
+++ b/docker/glance/glance-api/Dockerfile
@@ -1,4 +1,4 @@
-FROM glance-base
+FROM fedora-rdo-glance-base
 MAINTAINER Lars Kellogg-Stedman <lars@redhat.com>
 
 ADD ./start.sh /start.sh
diff --git a/docker/glance/glance-api/build b/docker/glance/glance-api/build
new file mode 100755
index 000000000..8e403a9a7
--- /dev/null
+++ b/docker/glance/glance-api/build
@@ -0,0 +1,2 @@
+#!/bin/bash
+docker build --tag fedora-rdo-glance-api .
diff --git a/docker/glance/glance-base/build b/docker/glance/glance-base/build
new file mode 100755
index 000000000..9a3a500c9
--- /dev/null
+++ b/docker/glance/glance-base/build
@@ -0,0 +1,2 @@
+#!/bin/bash
+docker build --tag fedora-rdo-glance-base .
diff --git a/docker/glance/glance-registry/Dockerfile b/docker/glance/glance-registry/Dockerfile
index e51be06ec..3d9992a5e 100644
--- a/docker/glance/glance-registry/Dockerfile
+++ b/docker/glance/glance-registry/Dockerfile
@@ -1,4 +1,4 @@
-FROM fedora-rdo-base
+FROM fedora-rdo-glance-base
 MAINTAINER Lars Kellogg-Stedman <lars@redhat.com>
 
 ADD ./start.sh /start.sh
diff --git a/docker/glance/glance-registry/build b/docker/glance/glance-registry/build
new file mode 100755
index 000000000..8c3c0d476
--- /dev/null
+++ b/docker/glance/glance-registry/build
@@ -0,0 +1,2 @@
+#!/bin/bash
+docker build --tag fedora-rdo-glance-registry .
diff --git a/docker/heat/heat-api/build b/docker/heat/heat-api/build
new file mode 100755
index 000000000..5c63fdb17
--- /dev/null
+++ b/docker/heat/heat-api/build
@@ -0,0 +1,2 @@
+#!/bin/bash
+docker build --tag fedora-rdo-heat-api .
diff --git a/docker/heat/heat-base/build b/docker/heat/heat-base/build
new file mode 100755
index 000000000..937f25970
--- /dev/null
+++ b/docker/heat/heat-base/build
@@ -0,0 +1,2 @@
+#!/bin/bash
+docker build --tag fedora-rdo-heat-base .
diff --git a/docker/heat/heat-engine/build b/docker/heat/heat-engine/build
new file mode 100755
index 000000000..b83ee2819
--- /dev/null
+++ b/docker/heat/heat-engine/build
@@ -0,0 +1,2 @@
+#!/bin/bash
+docker build --tag fedora-rdo-heat-engine .
diff --git a/docker/keystone/build b/docker/keystone/build
new file mode 100755
index 000000000..a92662c05
--- /dev/null
+++ b/docker/keystone/build
@@ -0,0 +1,2 @@
+#!/bin/bash
+docker build --tag fedora-rdo-keystone .
diff --git a/docker/mariadb/build b/docker/mariadb/build
new file mode 100755
index 000000000..7493d7654
--- /dev/null
+++ b/docker/mariadb/build
@@ -0,0 +1,2 @@
+#!/bin/bash
+docker build --tag fedora-rdo-mariadb .
diff --git a/docker/rabbitmq/build b/docker/rabbitmq/build
new file mode 100755
index 000000000..3636a3631
--- /dev/null
+++ b/docker/rabbitmq/build
@@ -0,0 +1,2 @@
+#!/bin/bash
+docker build --tag fedora-rdo-rabbitmq .
diff --git a/docker/rhel-osp-base/build b/docker/rhel-osp-base/build
new file mode 100755
index 000000000..cec1d2af1
--- /dev/null
+++ b/docker/rhel-osp-base/build
@@ -0,0 +1,2 @@
+#!/bin/bash
+docker build --tag rhel-osp-base .
diff --git a/docker/swift/swift-account/build b/docker/swift/swift-account/build
index d1733a86b..e6f866864 100755
--- a/docker/swift/swift-account/build
+++ b/docker/swift/swift-account/build
@@ -1,2 +1,2 @@
 #!/bin/bash
-sudo docker build --tag fedora-rdo-swift-account-server .
+docker build --tag fedora-rdo-swift-account-server .
diff --git a/docker/swift/swift-base/build b/docker/swift/swift-base/build
index 9ad15afd6..374471486 100755
--- a/docker/swift/swift-base/build
+++ b/docker/swift/swift-base/build
@@ -1,2 +1,2 @@
 #!/bin/bash
-sudo docker build --tag swift-proxy-base .
+docker build --tag fedora-rdo-swift-base .
diff --git a/docker/swift/swift-container/build b/docker/swift/swift-container/build
index 866c638ec..da13449cf 100755
--- a/docker/swift/swift-container/build
+++ b/docker/swift/swift-container/build
@@ -1,2 +1,2 @@
 #!/bin/bash
-sudo docker build --tag fedora-rdo-swift-container-server .
+docker build --tag fedora-rdo-swift-container-server .
diff --git a/docker/swift/swift-object/build b/docker/swift/swift-object/build
index c25af585c..44a80f3a0 100755
--- a/docker/swift/swift-object/build
+++ b/docker/swift/swift-object/build
@@ -1,2 +1,2 @@
 #!/bin/bash
-sudo docker build --tag fedora-rdo-swift-object-server .
+docker build --tag fedora-rdo-swift-object-server .
diff --git a/docker/swift/swift-proxy-server/build b/docker/swift/swift-proxy-server/build
index 376c1fb5b..804cd4e5d 100755
--- a/docker/swift/swift-proxy-server/build
+++ b/docker/swift/swift-proxy-server/build
@@ -1,2 +1,2 @@
 #!/bin/bash
-sudo docker build --tag fedora-rdo-swift-proxy-server .
+docker build --tag fedora-rdo-swift-proxy-server .