Merge pull request #9 from radez/glance

updating build and start scripts for glance

11 files changed, 50 insertions, 21 deletions

diff --git a/docker/glance/build b/docker/glance/build
new file mode 100755
index 000000000..7f0534c18
--- /dev/null
+++ b/docker/glance/build
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+for image in glance-base glance-api glance-registry; do
+(
+	pushd $image
+	./build
+        popd
+)
+done
+
diff --git a/docker/glance/build-all b/docker/glance/build-all
deleted file mode 100644
index 2de2ae692..000000000
--- a/docker/glance/build-all
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-
-for image in glance-base glance-api glance-registry; do
-(
-	cd $image
-	docker build -t docker.usersys.redhat.com/larsks/${image}:latest .
-	docker push docker.usersys.redhat.com/larsks/${image}:latest
-)
-done
-
diff --git a/docker/glance/glance-api-service.json b/docker/glance/glance-api-service.json
new file mode 100644
index 000000000..03a4896cd
--- /dev/null
+++ b/docker/glance/glance-api-service.json
@@ -0,0 +1,10 @@
+{
+  "id": "glanceapimaster",
+  "kind": "Service",
+  "apiVersion": "v1beta1",
+  "port": 9292,
+  "containerPort": 9292,
+  "selector": {
+    "name": "glance-api-master"
+  }
+}
diff --git a/docker/glance/glance-api/Dockerfile b/docker/glance/glance-api/Dockerfile
index 3d9992a5e..dcc1b47db 100644
--- a/docker/glance/glance-api/Dockerfile
+++ b/docker/glance/glance-api/Dockerfile
@@ -1,6 +1,5 @@
-FROM fedora-rdo-glance-base
-MAINTAINER Lars Kellogg-Stedman <lars@redhat.com>
+FROM kollaglue/fedora-rdo-glance-base
+MAINTAINER Dan Radez <dradez@redhat.com>
 
 ADD ./start.sh /start.sh
 CMD ["/start.sh"]
-
diff --git a/docker/glance/glance-api/start.sh b/docker/glance/glance-api/start.sh
index dbd1ae2e9..dbd1ae2e9 100644..100755
--- a/docker/glance/glance-api/start.sh
+++ b/docker/glance/glance-api/start.sh
diff --git a/docker/glance/glance-base/Dockerfile b/docker/glance/glance-base/Dockerfile
index b76e56c32..026ac3d2e 100644
--- a/docker/glance/glance-base/Dockerfile
+++ b/docker/glance/glance-base/Dockerfile
@@ -1,5 +1,5 @@
-FROM fedora-rdo-base
-MAINTAINER Lars Kellogg-Stedman <lars@redhat.com>
+FROM kollaglue/fedora-rdo-base
+MAINTAINER Dan Radez <dradez@redhat.com>
 
 RUN yum -y install \
 	openstack-utils \
diff --git a/docker/glance/glance-registry-service.json b/docker/glance/glance-registry-service.json
new file mode 100644
index 000000000..39ceebe69
--- /dev/null
+++ b/docker/glance/glance-registry-service.json
@@ -0,0 +1,10 @@
+{
+  "id": "glanceregistrymaster",
+  "kind": "Service",
+  "apiVersion": "v1beta1",
+  "port": 9191,
+  "containerPort": 9191,
+  "selector": {
+    "name": "glance-registry-master"
+  }
+}
diff --git a/docker/glance/glance-registry/Dockerfile b/docker/glance/glance-registry/Dockerfile
index 3d9992a5e..1685cc092 100644
--- a/docker/glance/glance-registry/Dockerfile
+++ b/docker/glance/glance-registry/Dockerfile
@@ -1,5 +1,5 @@
-FROM fedora-rdo-glance-base
-MAINTAINER Lars Kellogg-Stedman <lars@redhat.com>
+FROM kollaglue/fedora-rdo-glance-base
+MAINTAINER Dan Radez <dradez@redhat.com>
 
 ADD ./start.sh /start.sh
 CMD ["/start.sh"]
diff --git a/docker/glance/glance-registry/start.sh b/docker/glance/glance-registry/start.sh
index 4c362fc24..4c362fc24 100644..100755
--- a/docker/glance/glance-registry/start.sh
+++ b/docker/glance/glance-registry/start.sh
diff --git a/docker/glance/glance.json b/docker/glance/glance.json
index 57abad7b4..f49a3d27d 100644
--- a/docker/glance/glance.json
+++ b/docker/glance/glance.json
@@ -7,9 +7,9 @@
       "containers": [
         {
           "name": "glance-registry",
-          "image": "docker.usersys.redhat.com/larsks/glance-registry",
+          "image": "kollaglue/fedora-rdo-glance-registry",
           "ports": [
-            {"containerPort": 9292},
+            {"containerPort": 9191},
           ],
           "env": [
             {
@@ -28,7 +28,7 @@
         },
         {
           "name": "glance-api",
-          "image": "docker.usersys.redhat.com/larsks/glance-api",
+          "image": "kollaglue/fedora-rdo-glance-api",
           "ports": [
             {"containerPort": 9292},
           ],
@@ -51,6 +51,6 @@
     }
   },
   "labels": {
-    "name": "keystone-master"
+    "name": "glance-master"
   }
 }
diff --git a/docker/glance/push b/docker/glance/push
new file mode 100755
index 000000000..daadc4937
--- /dev/null
+++ b/docker/glance/push
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+for image in glance-base glance-api glance-registry; do
+(
+	pushd $image
+	./push
+	popd
+)
+done
+