From f895ee07cc5c1030e32854cf9a4e91bbeaf4de12 Mon Sep 17 00:00:00 2001 From: Steven Dake Date: Thu, 27 Aug 2015 19:23:49 -0700 Subject: 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 --- docker/centos/binary/gnocchi/gnocchi-api/Dockerfile | 11 ----------- docker/centos/binary/gnocchi/gnocchi-api/build | 1 - docker/centos/binary/gnocchi/gnocchi-api/config-external.sh | 1 - docker/centos/binary/gnocchi/gnocchi-api/start.sh | 1 - docker/centos/binary/gnocchi/gnocchi-base/Dockerfile | 2 -- docker/centos/binary/gnocchi/gnocchi-base/build | 1 - docker/centos/binary/gnocchi/gnocchi-statsd/Dockerfile | 8 -------- docker/centos/binary/gnocchi/gnocchi-statsd/build | 1 - .../centos/binary/gnocchi/gnocchi-statsd/config-external.sh | 1 - docker/centos/binary/gnocchi/gnocchi-statsd/start.sh | 1 - 10 files changed, 28 deletions(-) delete mode 100644 docker/centos/binary/gnocchi/gnocchi-api/Dockerfile delete mode 120000 docker/centos/binary/gnocchi/gnocchi-api/build delete mode 120000 docker/centos/binary/gnocchi/gnocchi-api/config-external.sh delete mode 120000 docker/centos/binary/gnocchi/gnocchi-api/start.sh delete mode 100644 docker/centos/binary/gnocchi/gnocchi-base/Dockerfile delete mode 120000 docker/centos/binary/gnocchi/gnocchi-base/build delete mode 100644 docker/centos/binary/gnocchi/gnocchi-statsd/Dockerfile delete mode 120000 docker/centos/binary/gnocchi/gnocchi-statsd/build delete mode 120000 docker/centos/binary/gnocchi/gnocchi-statsd/config-external.sh delete mode 120000 docker/centos/binary/gnocchi/gnocchi-statsd/start.sh (limited to 'docker/centos/binary/gnocchi') diff --git a/docker/centos/binary/gnocchi/gnocchi-api/Dockerfile b/docker/centos/binary/gnocchi/gnocchi-api/Dockerfile deleted file mode 100644 index eee474e37..000000000 --- a/docker/centos/binary/gnocchi/gnocchi-api/Dockerfile +++ /dev/null @@ -1,11 +0,0 @@ -FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%gnocchi-base:%%KOLLA_TAG%% -MAINTAINER Kolla Project (https://launchpad.net/kolla) - -RUN yum install -y openstack-gnocchi-api \ - openstack-gnocchi-carbonara \ - openstack-gnocchi-indexer-sqlalchemy \ - && yum clean all - -COPY start.sh / - -CMD ["/start.sh"] diff --git a/docker/centos/binary/gnocchi/gnocchi-api/build b/docker/centos/binary/gnocchi/gnocchi-api/build deleted file mode 120000 index ec1913803..000000000 --- a/docker/centos/binary/gnocchi/gnocchi-api/build +++ /dev/null @@ -1 +0,0 @@ -../../../../../tools/build-docker-image \ No newline at end of file diff --git a/docker/centos/binary/gnocchi/gnocchi-api/config-external.sh b/docker/centos/binary/gnocchi/gnocchi-api/config-external.sh deleted file mode 120000 index 471d03664..000000000 --- a/docker/centos/binary/gnocchi/gnocchi-api/config-external.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../common/gnocchi/gnocchi-api/config-external.sh \ No newline at end of file diff --git a/docker/centos/binary/gnocchi/gnocchi-api/start.sh b/docker/centos/binary/gnocchi/gnocchi-api/start.sh deleted file mode 120000 index 99320c6d0..000000000 --- a/docker/centos/binary/gnocchi/gnocchi-api/start.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../common/gnocchi/gnocchi-api/start.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 deleted file mode 100644 index 30c8fbae3..000000000 --- a/docker/centos/binary/gnocchi/gnocchi-base/Dockerfile +++ /dev/null @@ -1,2 +0,0 @@ -FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%base:%%KOLLA_TAG%% -MAINTAINER Kolla Project (https://launchpad.net/kolla) diff --git a/docker/centos/binary/gnocchi/gnocchi-base/build b/docker/centos/binary/gnocchi/gnocchi-base/build deleted file mode 120000 index ec1913803..000000000 --- a/docker/centos/binary/gnocchi/gnocchi-base/build +++ /dev/null @@ -1 +0,0 @@ -../../../../../tools/build-docker-image \ No newline at end of file diff --git a/docker/centos/binary/gnocchi/gnocchi-statsd/Dockerfile b/docker/centos/binary/gnocchi/gnocchi-statsd/Dockerfile deleted file mode 100644 index 354c312d0..000000000 --- a/docker/centos/binary/gnocchi/gnocchi-statsd/Dockerfile +++ /dev/null @@ -1,8 +0,0 @@ -FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%gnocchi-base:%%KOLLA_TAG%% -MAINTAINER Kolla Project (https://launchpad.net/kolla) - -RUN yum install -y openstack-gnocchi-statsd && yum clean all - -COPY start.sh / - -CMD ["/start.sh"] diff --git a/docker/centos/binary/gnocchi/gnocchi-statsd/build b/docker/centos/binary/gnocchi/gnocchi-statsd/build deleted file mode 120000 index ec1913803..000000000 --- a/docker/centos/binary/gnocchi/gnocchi-statsd/build +++ /dev/null @@ -1 +0,0 @@ -../../../../../tools/build-docker-image \ No newline at end of file diff --git a/docker/centos/binary/gnocchi/gnocchi-statsd/config-external.sh b/docker/centos/binary/gnocchi/gnocchi-statsd/config-external.sh deleted file mode 120000 index fe516e42c..000000000 --- a/docker/centos/binary/gnocchi/gnocchi-statsd/config-external.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../common/gnocchi/gnocchi-statsd/config-external.sh \ No newline at end of file diff --git a/docker/centos/binary/gnocchi/gnocchi-statsd/start.sh b/docker/centos/binary/gnocchi/gnocchi-statsd/start.sh deleted file mode 120000 index ad961553e..000000000 --- a/docker/centos/binary/gnocchi/gnocchi-statsd/start.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../common/gnocchi/gnocchi-statsd/start.sh \ No newline at end of file -- cgit v1.2.3