diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-08-09 17:16:32 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-08-09 17:16:32 +0000 |
| commit | 3eeea92f9997425e105df7febd19e6c9a39d0cb3 (patch) | |
| tree | 8b85ef338f778a2b3d9034de47f2adb7dc57b86a /docker/centos | |
| parent | 146e492a83a32138ad787092514bf22f3f3baa3b (diff) | |
| parent | 65ed3c7f53ba19e8f221b293faa9021607c1f627 (diff) | |
| download | kolla-3eeea92f9997425e105df7febd19e6c9a39d0cb3.tar.gz kolla-3eeea92f9997425e105df7febd19e6c9a39d0cb3.zip | |
Merge "Remove config-internal for gnocchi"
Diffstat (limited to 'docker/centos')
12 files changed, 8 insertions, 20 deletions
diff --git a/docker/centos/binary/gnocchi/gnocchi-api/Dockerfile b/docker/centos/binary/gnocchi/gnocchi-api/Dockerfile index cd5974a22..eee474e37 100644 --- a/docker/centos/binary/gnocchi/gnocchi-api/Dockerfile +++ b/docker/centos/binary/gnocchi/gnocchi-api/Dockerfile @@ -6,5 +6,6 @@ RUN yum install -y openstack-gnocchi-api \ openstack-gnocchi-indexer-sqlalchemy \ && yum clean all -COPY ./start.sh /start.sh +COPY start.sh / + CMD ["/start.sh"] diff --git a/docker/centos/binary/gnocchi/gnocchi-api/config-internal.sh b/docker/centos/binary/gnocchi/gnocchi-api/config-internal.sh deleted file mode 120000 index 79578ce60..000000000 --- a/docker/centos/binary/gnocchi/gnocchi-api/config-internal.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../common/gnocchi/gnocchi-api/config-internal.sh
\ No newline at end of file diff --git a/docker/centos/binary/gnocchi/gnocchi-base/Dockerfile b/docker/centos/binary/gnocchi/gnocchi-base/Dockerfile index e9d67da7c..30c8fbae3 100644 --- a/docker/centos/binary/gnocchi/gnocchi-base/Dockerfile +++ b/docker/centos/binary/gnocchi/gnocchi-base/Dockerfile @@ -1,4 +1,2 @@ FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%base:%%KOLLA_TAG%% MAINTAINER Kolla Project (https://launchpad.net/kolla) - -COPY config-gnocchi.sh /opt/kolla/config-gnocchi.sh diff --git a/docker/centos/binary/gnocchi/gnocchi-base/config-gnocchi.sh b/docker/centos/binary/gnocchi/gnocchi-base/config-gnocchi.sh deleted file mode 120000 index 75a8a5e10..000000000 --- a/docker/centos/binary/gnocchi/gnocchi-base/config-gnocchi.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../common/gnocchi/gnocchi-base/config-gnocchi.sh
\ No newline at end of file diff --git a/docker/centos/binary/gnocchi/gnocchi-statsd/Dockerfile b/docker/centos/binary/gnocchi/gnocchi-statsd/Dockerfile index 7998a3621..354c312d0 100644 --- a/docker/centos/binary/gnocchi/gnocchi-statsd/Dockerfile +++ b/docker/centos/binary/gnocchi/gnocchi-statsd/Dockerfile @@ -3,5 +3,6 @@ MAINTAINER Kolla Project (https://launchpad.net/kolla) RUN yum install -y openstack-gnocchi-statsd && yum clean all -COPY ./start.sh /start.sh +COPY start.sh / + CMD ["/start.sh"] diff --git a/docker/centos/binary/gnocchi/gnocchi-statsd/config-internal.sh b/docker/centos/binary/gnocchi/gnocchi-statsd/config-internal.sh deleted file mode 120000 index 9d9ebfa7d..000000000 --- a/docker/centos/binary/gnocchi/gnocchi-statsd/config-internal.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../common/gnocchi/gnocchi-statsd/config-internal.sh
\ No newline at end of file diff --git a/docker/centos/source/gnocchi/gnocchi-api/Dockerfile b/docker/centos/source/gnocchi/gnocchi-api/Dockerfile index 5c173f51e..ad16c6e00 100644 --- a/docker/centos/source/gnocchi/gnocchi-api/Dockerfile +++ b/docker/centos/source/gnocchi/gnocchi-api/Dockerfile @@ -1,8 +1,7 @@ FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%gnocchi-base:%%KOLLA_TAG%% MAINTAINER Kolla Project (https://launchpad.net/kolla) -COPY ./start.sh /start.sh - -COPY config-internal.sh config-external.sh /opt/kolla/ +COPY start.sh / +COPY config-external.sh /opt/kolla/ CMD ["/start.sh"] diff --git a/docker/centos/source/gnocchi/gnocchi-api/config-internal.sh b/docker/centos/source/gnocchi/gnocchi-api/config-internal.sh deleted file mode 120000 index 79578ce60..000000000 --- a/docker/centos/source/gnocchi/gnocchi-api/config-internal.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../common/gnocchi/gnocchi-api/config-internal.sh
\ No newline at end of file diff --git a/docker/centos/source/gnocchi/gnocchi-base/Dockerfile b/docker/centos/source/gnocchi/gnocchi-base/Dockerfile index 2be4324ec..3bcc44125 100644 --- a/docker/centos/source/gnocchi/gnocchi-base/Dockerfile +++ b/docker/centos/source/gnocchi/gnocchi-base/Dockerfile @@ -11,7 +11,3 @@ RUN cd /gnocchi \ && mkdir /etc/gnocchi /var/log/gnocchi \ && cp -r /gnocchi/etc/* /etc/gnocchi/ \ && rm -rf /root/.cache - -COPY config-gnocchi.sh /opt/kolla/config-gnocchi.sh - -CMD ["/start.sh"] diff --git a/docker/centos/source/gnocchi/gnocchi-base/config-gnocchi.sh b/docker/centos/source/gnocchi/gnocchi-base/config-gnocchi.sh deleted file mode 120000 index 75a8a5e10..000000000 --- a/docker/centos/source/gnocchi/gnocchi-base/config-gnocchi.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../common/gnocchi/gnocchi-base/config-gnocchi.sh
\ No newline at end of file diff --git a/docker/centos/source/gnocchi/gnocchi-statsd/Dockerfile b/docker/centos/source/gnocchi/gnocchi-statsd/Dockerfile index 5c173f51e..ad16c6e00 100644 --- a/docker/centos/source/gnocchi/gnocchi-statsd/Dockerfile +++ b/docker/centos/source/gnocchi/gnocchi-statsd/Dockerfile @@ -1,8 +1,7 @@ FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%gnocchi-base:%%KOLLA_TAG%% MAINTAINER Kolla Project (https://launchpad.net/kolla) -COPY ./start.sh /start.sh - -COPY config-internal.sh config-external.sh /opt/kolla/ +COPY start.sh / +COPY config-external.sh /opt/kolla/ CMD ["/start.sh"] diff --git a/docker/centos/source/gnocchi/gnocchi-statsd/config-internal.sh b/docker/centos/source/gnocchi/gnocchi-statsd/config-internal.sh deleted file mode 120000 index 9d9ebfa7d..000000000 --- a/docker/centos/source/gnocchi/gnocchi-statsd/config-internal.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../common/gnocchi/gnocchi-statsd/config-internal.sh
\ No newline at end of file |