diff options
| author | Steven Dake <stdake@cisco.com> | 2015-08-27 19:23:49 -0700 |
|---|---|---|
| committer | Steven Dake <stdake@cisco.com> | 2015-08-28 00:50:30 -0700 |
| commit | f895ee07cc5c1030e32854cf9a4e91bbeaf4de12 (patch) | |
| tree | cc7d17c2c63bf83f6a983553b8729f67abeac58d /docker/ubuntu/binary/keystone | |
| parent | 5c82e0c90ce0fedf523b11b0b933f2276edf8f46 (diff) | |
| download | kolla-f895ee07cc5c1030e32854cf9a4e91bbeaf4de12.tar.gz kolla-f895ee07cc5c1030e32854cf9a4e91bbeaf4de12.zip | |
Remove docker directory
Remove the docker directory (yay) and old build tools.
This will result in an f21 failing gate - however, I have a patch
submission to remove that gate from our project configuration.
Change-Id: I3c461cedb6906422c8076f60c470e773d6cdcf33
Partially-Implements: blueprint remove-docker-dir
Diffstat (limited to 'docker/ubuntu/binary/keystone')
| -rw-r--r-- | docker/ubuntu/binary/keystone/Dockerfile | 22 | ||||
| l--------- | docker/ubuntu/binary/keystone/build | 1 | ||||
| l--------- | docker/ubuntu/binary/keystone/start.sh | 1 |
3 files changed, 0 insertions, 24 deletions
diff --git a/docker/ubuntu/binary/keystone/Dockerfile b/docker/ubuntu/binary/keystone/Dockerfile deleted file mode 100644 index 9ce96618e..000000000 --- a/docker/ubuntu/binary/keystone/Dockerfile +++ /dev/null @@ -1,22 +0,0 @@ -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 / - -CMD ["/start.sh"] diff --git a/docker/ubuntu/binary/keystone/build b/docker/ubuntu/binary/keystone/build deleted file mode 120000 index 8d652f7ee..000000000 --- a/docker/ubuntu/binary/keystone/build +++ /dev/null @@ -1 +0,0 @@ -../../../../tools/build-docker-image
\ No newline at end of file diff --git a/docker/ubuntu/binary/keystone/start.sh b/docker/ubuntu/binary/keystone/start.sh deleted file mode 120000 index ae34844ea..000000000 --- a/docker/ubuntu/binary/keystone/start.sh +++ /dev/null @@ -1 +0,0 @@ -../../../common/keystone/start.sh
\ No newline at end of file |