diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-08-09 17:18:01 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-08-09 17:18:01 +0000 |
| commit | f0105d89f743ec3b75621b3098060eec2393ddc0 (patch) | |
| tree | d72e625f8498932bcf1cef0cfc5854e621e4619e /docker/ubuntu/binary | |
| parent | 2bf8b2986f0774911e64b2c3a1f639983a12ee89 (diff) | |
| parent | f631243a71c3d2647da4741b53fb8280c65c6432 (diff) | |
| download | kolla-f0105d89f743ec3b75621b3098060eec2393ddc0.tar.gz kolla-f0105d89f743ec3b75621b3098060eec2393ddc0.zip | |
Merge "Remove config-internal for keystone"
Diffstat (limited to 'docker/ubuntu/binary')
| -rw-r--r-- | docker/ubuntu/binary/keystone/Dockerfile | 2 | ||||
| l--------- | docker/ubuntu/binary/keystone/check.sh | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/docker/ubuntu/binary/keystone/Dockerfile b/docker/ubuntu/binary/keystone/Dockerfile index af362252d..9ce96618e 100644 --- a/docker/ubuntu/binary/keystone/Dockerfile +++ b/docker/ubuntu/binary/keystone/Dockerfile @@ -17,6 +17,6 @@ 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 / +COPY start.sh / CMD ["/start.sh"] diff --git a/docker/ubuntu/binary/keystone/check.sh b/docker/ubuntu/binary/keystone/check.sh deleted file mode 120000 index fe8e7608c..000000000 --- a/docker/ubuntu/binary/keystone/check.sh +++ /dev/null @@ -1 +0,0 @@ -../../../common/keystone/check.sh
\ No newline at end of file |