diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-07-13 17:16:04 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-07-13 17:16:04 +0000 |
| commit | 2756663685be19a3c5b08f73af6c49cb9603448d (patch) | |
| tree | fd31b6d0a056a94d030046541420e7abb6178772 /docker | |
| parent | 69338a94ba0969241a8b669eba824956912d71c4 (diff) | |
| parent | 0ffd2deaa23f1b65a4940f98bf2101308921d748 (diff) | |
| download | kolla-2756663685be19a3c5b08f73af6c49cb9603448d.tar.gz kolla-2756663685be19a3c5b08f73af6c49cb9603448d.zip | |
Merge "Add Keystone image for Ubuntu"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/ubuntu/binary/base/Dockerfile | 1 | ||||
| -rw-r--r-- | docker/ubuntu/binary/keystone/Dockerfile | 22 | ||||
| l--------- | docker/ubuntu/binary/keystone/build | 1 | ||||
| l--------- | docker/ubuntu/binary/keystone/check.sh | 1 | ||||
| l--------- | docker/ubuntu/binary/keystone/start.sh | 1 |
5 files changed, 26 insertions, 0 deletions
diff --git a/docker/ubuntu/binary/base/Dockerfile b/docker/ubuntu/binary/base/Dockerfile index c48c3e32b..e5e0f5242 100644 --- a/docker/ubuntu/binary/base/Dockerfile +++ b/docker/ubuntu/binary/base/Dockerfile @@ -9,6 +9,7 @@ RUN apt-get update \ && apt-get dist-upgrade -y \ && apt-get install -y --no-install-recommends \ crudini \ + curl \ openssl \ && apt-get clean diff --git a/docker/ubuntu/binary/keystone/Dockerfile b/docker/ubuntu/binary/keystone/Dockerfile new file mode 100644 index 000000000..af362252d --- /dev/null +++ b/docker/ubuntu/binary/keystone/Dockerfile @@ -0,0 +1,22 @@ +FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%base:%%KOLLA_TAG%% +MAINTAINER Kolla Project (https://launchpad.net/kolla) + +RUN apt-get install -y --no-install-recommends \ + apache2 \ + keystone \ + libapache2-mod-wsgi \ + python-keystoneclient \ + && apt-get clean + +RUN curl -o /etc/apache2/sites-available/wsgi-keystone.conf \ + https://raw.githubusercontent.com/openstack/keystone/stable/kilo/httpd/wsgi-keystone.conf +RUN ln -s /etc/apache2/sites-available/wsgi-keystone.conf /etc/apache2/sites-enabled +RUN mkdir -p /var/www/cgi-bin/keystone +RUN cp -a /usr/share/keystone/wsgi.py /var/www/cgi-bin/keystone/main +RUN cp -a /usr/share/keystone/wsgi.py /var/www/cgi-bin/keystone/admin +RUN chown -R keystone:keystone /var/www/cgi-bin/keystone +RUN chmod 755 /var/www/cgi-bin/keystone/* + +COPY start.sh check.sh / + +CMD ["/start.sh"] diff --git a/docker/ubuntu/binary/keystone/build b/docker/ubuntu/binary/keystone/build new file mode 120000 index 000000000..8d652f7ee --- /dev/null +++ b/docker/ubuntu/binary/keystone/build @@ -0,0 +1 @@ +../../../../tools/build-docker-image
\ No newline at end of file diff --git a/docker/ubuntu/binary/keystone/check.sh b/docker/ubuntu/binary/keystone/check.sh new file mode 120000 index 000000000..fe8e7608c --- /dev/null +++ b/docker/ubuntu/binary/keystone/check.sh @@ -0,0 +1 @@ +../../../common/keystone/check.sh
\ No newline at end of file diff --git a/docker/ubuntu/binary/keystone/start.sh b/docker/ubuntu/binary/keystone/start.sh new file mode 120000 index 000000000..ae34844ea --- /dev/null +++ b/docker/ubuntu/binary/keystone/start.sh @@ -0,0 +1 @@ +../../../common/keystone/start.sh
\ No newline at end of file |