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/glance/glance-api/Dockerfile | 7 ------- docker/centos/binary/glance/glance-api/build | 1 - docker/centos/binary/glance/glance-api/config-external.sh | 1 - docker/centos/binary/glance/glance-api/start.sh | 1 - docker/centos/binary/glance/glance-base/Dockerfile | 4 ---- docker/centos/binary/glance/glance-base/build | 1 - docker/centos/binary/glance/glance-registry/Dockerfile | 7 ------- docker/centos/binary/glance/glance-registry/build | 1 - docker/centos/binary/glance/glance-registry/config-external.sh | 1 - docker/centos/binary/glance/glance-registry/start.sh | 1 - 10 files changed, 25 deletions(-) delete mode 100644 docker/centos/binary/glance/glance-api/Dockerfile delete mode 120000 docker/centos/binary/glance/glance-api/build delete mode 120000 docker/centos/binary/glance/glance-api/config-external.sh delete mode 120000 docker/centos/binary/glance/glance-api/start.sh delete mode 100644 docker/centos/binary/glance/glance-base/Dockerfile delete mode 120000 docker/centos/binary/glance/glance-base/build delete mode 100644 docker/centos/binary/glance/glance-registry/Dockerfile delete mode 120000 docker/centos/binary/glance/glance-registry/build delete mode 120000 docker/centos/binary/glance/glance-registry/config-external.sh delete mode 120000 docker/centos/binary/glance/glance-registry/start.sh (limited to 'docker/centos/binary/glance') diff --git a/docker/centos/binary/glance/glance-api/Dockerfile b/docker/centos/binary/glance/glance-api/Dockerfile deleted file mode 100644 index c3c0fd9d1..000000000 --- a/docker/centos/binary/glance/glance-api/Dockerfile +++ /dev/null @@ -1,7 +0,0 @@ -FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%glance-base:%%KOLLA_TAG%% -MAINTAINER Kolla Project (https://launchpad.net/kolla) - -COPY start.sh / -COPY config-external.sh /opt/kolla/ - -CMD ["/start.sh"] diff --git a/docker/centos/binary/glance/glance-api/build b/docker/centos/binary/glance/glance-api/build deleted file mode 120000 index ec1913803..000000000 --- a/docker/centos/binary/glance/glance-api/build +++ /dev/null @@ -1 +0,0 @@ -../../../../../tools/build-docker-image \ No newline at end of file diff --git a/docker/centos/binary/glance/glance-api/config-external.sh b/docker/centos/binary/glance/glance-api/config-external.sh deleted file mode 120000 index 46a22b7b3..000000000 --- a/docker/centos/binary/glance/glance-api/config-external.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../common/glance/glance-api/config-external.sh \ No newline at end of file diff --git a/docker/centos/binary/glance/glance-api/start.sh b/docker/centos/binary/glance/glance-api/start.sh deleted file mode 120000 index 6740e1fe9..000000000 --- a/docker/centos/binary/glance/glance-api/start.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../common/glance/glance-api/start.sh \ No newline at end of file diff --git a/docker/centos/binary/glance/glance-base/Dockerfile b/docker/centos/binary/glance/glance-base/Dockerfile deleted file mode 100644 index 38e63c761..000000000 --- a/docker/centos/binary/glance/glance-base/Dockerfile +++ /dev/null @@ -1,4 +0,0 @@ -FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%base:%%KOLLA_TAG%% -MAINTAINER Kolla Project (https://launchpad.net/kolla) - -RUN yum -y install openstack-glance python-oslo-i18n && yum clean all diff --git a/docker/centos/binary/glance/glance-base/build b/docker/centos/binary/glance/glance-base/build deleted file mode 120000 index ec1913803..000000000 --- a/docker/centos/binary/glance/glance-base/build +++ /dev/null @@ -1 +0,0 @@ -../../../../../tools/build-docker-image \ No newline at end of file diff --git a/docker/centos/binary/glance/glance-registry/Dockerfile b/docker/centos/binary/glance/glance-registry/Dockerfile deleted file mode 100644 index 11b584eed..000000000 --- a/docker/centos/binary/glance/glance-registry/Dockerfile +++ /dev/null @@ -1,7 +0,0 @@ -FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%glance-base:%%KOLLA_TAG%% -MAINTAINER Kolla Project (https://launchpad.net/kolla) - -COPY config-external.sh /opt/kolla/ - -COPY ./start.sh /start.sh -CMD ["/start.sh"] diff --git a/docker/centos/binary/glance/glance-registry/build b/docker/centos/binary/glance/glance-registry/build deleted file mode 120000 index ec1913803..000000000 --- a/docker/centos/binary/glance/glance-registry/build +++ /dev/null @@ -1 +0,0 @@ -../../../../../tools/build-docker-image \ No newline at end of file diff --git a/docker/centos/binary/glance/glance-registry/config-external.sh b/docker/centos/binary/glance/glance-registry/config-external.sh deleted file mode 120000 index cfcbd1391..000000000 --- a/docker/centos/binary/glance/glance-registry/config-external.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../common/glance/glance-registry/config-external.sh \ No newline at end of file diff --git a/docker/centos/binary/glance/glance-registry/start.sh b/docker/centos/binary/glance/glance-registry/start.sh deleted file mode 120000 index 1295cdc31..000000000 --- a/docker/centos/binary/glance/glance-registry/start.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../common/glance/glance-registry/start.sh \ No newline at end of file -- cgit v1.2.3