Merge pull request #9 from radez/glance

updating build and start scripts for glance

docker/glance/build

@@ -0,0 +1,10 @@
+#!/bin/sh
+
+for image in glance-base glance-api glance-registry; do
+(
+	pushd $image
+	./build
+        popd
+)
+done
+

docker/glance/build-all

@@ -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
-

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"
+  }
+}

docker/glance/glance-api/Dockerfile

@@ -1,6 +1,5 @@
-FROM fedora-rdo-glance-base
+FROM kollaglue/fedora-rdo-glance-base
-MAINTAINER Lars Kellogg-Stedman <lars@redhat.com>
+MAINTAINER Dan Radez <dradez@redhat.com>
 
 ADD ./start.sh /start.sh
 CMD ["/start.sh"]
-

docker/glance/glance-base/Dockerfile

@@ -1,5 +1,5 @@
-FROM fedora-rdo-base
+FROM kollaglue/fedora-rdo-base
-MAINTAINER Lars Kellogg-Stedman <lars@redhat.com>
+MAINTAINER Dan Radez <dradez@redhat.com>
 
 RUN yum -y install \
 	openstack-utils \

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"
+  }
+}

docker/glance/glance-registry/Dockerfile

@@ -1,5 +1,5 @@
-FROM fedora-rdo-glance-base
+FROM kollaglue/fedora-rdo-glance-base
-MAINTAINER Lars Kellogg-Stedman <lars@redhat.com>
+MAINTAINER Dan Radez <dradez@redhat.com>
 
 ADD ./start.sh /start.sh
 CMD ["/start.sh"]

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"
   }
 }

docker/glance/push

@@ -0,0 +1,10 @@
+#!/bin/sh
+
+for image in glance-base glance-api glance-registry; do
+(
+	pushd $image
+	./push
+	popd
+)
+done
+