diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-07-04 20:11:50 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-07-04 20:11:50 +0000 |
| commit | 1c5988e642d1ca938f82f0b4546778c53abb56c8 (patch) | |
| tree | 752f045dedb06d1c18da38ee37860a26b36d3392 /docker/centos/binary | |
| parent | 1054ccbb8cec3e53d4cb5228905b779a3086d403 (diff) | |
| parent | 656ba297e725b406d39c5143da2c7ade3bbaad52 (diff) | |
| download | kolla-1c5988e642d1ca938f82f0b4546778c53abb56c8.tar.gz kolla-1c5988e642d1ca938f82f0b4546778c53abb56c8.zip | |
Merge "Add config-internal/config-external to Glance containers"
Diffstat (limited to 'docker/centos/binary')
6 files changed, 8 insertions, 0 deletions
diff --git a/docker/centos/binary/glance/glance-api/Dockerfile b/docker/centos/binary/glance/glance-api/Dockerfile index 5ff83508f..70e87a882 100644 --- a/docker/centos/binary/glance/glance-api/Dockerfile +++ b/docker/centos/binary/glance/glance-api/Dockerfile @@ -4,4 +4,6 @@ MAINTAINER Kolla Project (https://launchpad.net/kolla) ADD ./start.sh /start.sh ADD ./check.sh /check.sh +COPY config-internal.sh config-external.sh /opt/kolla/ + CMD ["/start.sh"] diff --git a/docker/centos/binary/glance/glance-api/config-external.sh b/docker/centos/binary/glance/glance-api/config-external.sh new file mode 120000 index 000000000..46a22b7b3 --- /dev/null +++ b/docker/centos/binary/glance/glance-api/config-external.sh @@ -0,0 +1 @@ +../../../../common/glance/glance-api/config-external.sh
\ No newline at end of file diff --git a/docker/centos/binary/glance/glance-api/config-internal.sh b/docker/centos/binary/glance/glance-api/config-internal.sh new file mode 120000 index 000000000..112e6557c --- /dev/null +++ b/docker/centos/binary/glance/glance-api/config-internal.sh @@ -0,0 +1 @@ +../../../../common/glance/glance-api/config-internal.sh
\ No newline at end of file diff --git a/docker/centos/binary/glance/glance-registry/Dockerfile b/docker/centos/binary/glance/glance-registry/Dockerfile index f950ce685..27269a03e 100644 --- a/docker/centos/binary/glance/glance-registry/Dockerfile +++ b/docker/centos/binary/glance/glance-registry/Dockerfile @@ -1,5 +1,7 @@ FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%glance-base:%%KOLLA_TAG%% MAINTAINER Kolla Project (https://launchpad.net/kolla) +COPY config-internal.sh config-external.sh /opt/kolla/ + ADD ./start.sh /start.sh CMD ["/start.sh"] diff --git a/docker/centos/binary/glance/glance-registry/config-external.sh b/docker/centos/binary/glance/glance-registry/config-external.sh new file mode 120000 index 000000000..cfcbd1391 --- /dev/null +++ b/docker/centos/binary/glance/glance-registry/config-external.sh @@ -0,0 +1 @@ +../../../../common/glance/glance-registry/config-external.sh
\ No newline at end of file diff --git a/docker/centos/binary/glance/glance-registry/config-internal.sh b/docker/centos/binary/glance/glance-registry/config-internal.sh new file mode 120000 index 000000000..c3d48cfc0 --- /dev/null +++ b/docker/centos/binary/glance/glance-registry/config-internal.sh @@ -0,0 +1 @@ +../../../../common/glance/glance-registry/config-internal.sh
\ No newline at end of file |