aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars Kellogg-Stedman <lars@redhat.com>2014-09-18 13:09:35 -0400
committerLars Kellogg-Stedman <lars@redhat.com>2014-09-18 13:09:35 -0400
commit60b9ffa262491fec5f72116374e7cc46f0453c0a (patch)
tree5aac7edeb273802d54d2268f1d9d2d95e8a644c3
parent88b832b2b8ddfb10715d3fbc42c9d091e62fc929 (diff)
downloadkolla-60b9ffa262491fec5f72116374e7cc46f0453c0a.tar.gz
kolla-60b9ffa262491fec5f72116374e7cc46f0453c0a.zip
re-create dockerfile that was on server and not committed
-rw-r--r--docker/keystone/Dockerfile19
-rwxr-xr-xdocker/keystone/start.sh (renamed from docker/keystone/start)0
2 files changed, 3 insertions, 16 deletions
diff --git a/docker/keystone/Dockerfile b/docker/keystone/Dockerfile
index 5eb45d814..3cd378ce3 100644
--- a/docker/keystone/Dockerfile
+++ b/docker/keystone/Dockerfile
@@ -1,23 +1,10 @@
FROM rhel7
MAINTAINER jlabocki@redhat.com
-# This Dockerfile installs the components of Keystone in a docker image as a proof of concept
-RUN date > /root/date
-
#Install required packages
RUN yum install -y wget procps-ng net-tools && yum clean all
-RUN yum install -y openstack-keystone openstack-utils openstack-selinux mariadb-galera-server socat && yum clean all
-
-#Service token stuff
-RUN export SERVICE_TOKEN=$(/usr/bin/openssl rand -hex 10) && /usr/bin/echo $SERVICE_TOKEN > /root/ks_admin_token && openstack-config --set /etc/keystone/keystone.conf DEFAULT admin_token $SERVICE_TOKEN && echo "export SERVICE_TOKEN=`cat /root/ks_admin_token`" > /root/ks_admin && echo "export SERVICE_ENDPOINT=\"http://127.0.0.1:35357/v2.0\"" >> /root/ks_admin
-
-#Eventually use rabbitmq-server (externally, but who knows, this might work too some day)
-#RUN yum install -y rabbitmq-server
-#RUN yum install -y mariadb-galera-server
-
-#Eventually use optimizied systemd for containers and use this to enable the service and start it
-#RUN yum install systemd-container
+RUN yum install -y openstack-keystone openstack-utils openstack-selinux && yum clean all
-ADD ./start /usr/bin/run
+ADD ./start.sh /start.sh
-CMD ["/usr/bin/run"]
+CMD ["/start.sh"]
diff --git a/docker/keystone/start b/docker/keystone/start.sh
index 2fcb91317..2fcb91317 100755
--- a/docker/keystone/start
+++ b/docker/keystone/start.sh