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/source/glance/glance-api/Dockerfile | 7 ------- docker/centos/source/glance/glance-api/build | 1 - .../centos/source/glance/glance-api/config-external.sh | 1 - docker/centos/source/glance/glance-api/start.sh | 1 - docker/centos/source/glance/glance-base/.buildinfo | 9 --------- docker/centos/source/glance/glance-base/Dockerfile | 16 ---------------- docker/centos/source/glance/glance-base/build | 1 - docker/centos/source/glance/glance-registry/Dockerfile | 7 ------- docker/centos/source/glance/glance-registry/build | 1 - .../source/glance/glance-registry/config-external.sh | 1 - docker/centos/source/glance/glance-registry/start.sh | 1 - 11 files changed, 46 deletions(-) delete mode 100644 docker/centos/source/glance/glance-api/Dockerfile delete mode 120000 docker/centos/source/glance/glance-api/build delete mode 120000 docker/centos/source/glance/glance-api/config-external.sh delete mode 120000 docker/centos/source/glance/glance-api/start.sh delete mode 100644 docker/centos/source/glance/glance-base/.buildinfo delete mode 100644 docker/centos/source/glance/glance-base/Dockerfile delete mode 120000 docker/centos/source/glance/glance-base/build delete mode 100644 docker/centos/source/glance/glance-registry/Dockerfile delete mode 120000 docker/centos/source/glance/glance-registry/build delete mode 120000 docker/centos/source/glance/glance-registry/config-external.sh delete mode 120000 docker/centos/source/glance/glance-registry/start.sh (limited to 'docker/centos/source/glance') diff --git a/docker/centos/source/glance/glance-api/Dockerfile b/docker/centos/source/glance/glance-api/Dockerfile deleted file mode 100644 index c3c0fd9d1..000000000 --- a/docker/centos/source/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/source/glance/glance-api/build b/docker/centos/source/glance/glance-api/build deleted file mode 120000 index ec1913803..000000000 --- a/docker/centos/source/glance/glance-api/build +++ /dev/null @@ -1 +0,0 @@ -../../../../../tools/build-docker-image \ No newline at end of file diff --git a/docker/centos/source/glance/glance-api/config-external.sh b/docker/centos/source/glance/glance-api/config-external.sh deleted file mode 120000 index 46a22b7b3..000000000 --- a/docker/centos/source/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/source/glance/glance-api/start.sh b/docker/centos/source/glance/glance-api/start.sh deleted file mode 120000 index 6740e1fe9..000000000 --- a/docker/centos/source/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/source/glance/glance-base/.buildinfo b/docker/centos/source/glance/glance-base/.buildinfo deleted file mode 100644 index 19c048a7e..000000000 --- a/docker/centos/source/glance/glance-base/.buildinfo +++ /dev/null @@ -1,9 +0,0 @@ -# Build info specific to this image. All values can be overridden in .buildconf -COMPONENT=glance -SOURCE_INSTALL_AVAILABLE=1 - -# Used for git install method -: ${CLONE_FROM:=https://github.com/openstack/glance} - -# Used for curl install method -: ${TARBALL_URI:=http://tarballs.openstack.org/glance/glance-master.tar.gz} diff --git a/docker/centos/source/glance/glance-base/Dockerfile b/docker/centos/source/glance/glance-base/Dockerfile deleted file mode 100644 index b2a41c49a..000000000 --- a/docker/centos/source/glance/glance-base/Dockerfile +++ /dev/null @@ -1,16 +0,0 @@ -FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%base:%%KOLLA_TAG%% -MAINTAINER Kolla Project (https://launchpad.net/kolla) - -ADD ./glance.tar / -RUN ln -s /glance-* /glance - -RUN cd /glance \ - && useradd --user-group glance \ - && pip install -r requirements.txt \ - && pip install /glance \ - && mkdir /etc/glance /var/log/glance \ - && cp -r /glance/etc/* /etc/glance/ \ - && chown -R glance: /etc/glance /var/log/glance \ - && rm -rf /root/.cache - -CMD ["/start.sh"] diff --git a/docker/centos/source/glance/glance-base/build b/docker/centos/source/glance/glance-base/build deleted file mode 120000 index ec1913803..000000000 --- a/docker/centos/source/glance/glance-base/build +++ /dev/null @@ -1 +0,0 @@ -../../../../../tools/build-docker-image \ No newline at end of file diff --git a/docker/centos/source/glance/glance-registry/Dockerfile b/docker/centos/source/glance/glance-registry/Dockerfile deleted file mode 100644 index 22e3fcb10..000000000 --- a/docker/centos/source/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 / -CMD ["/start.sh"] diff --git a/docker/centos/source/glance/glance-registry/build b/docker/centos/source/glance/glance-registry/build deleted file mode 120000 index ec1913803..000000000 --- a/docker/centos/source/glance/glance-registry/build +++ /dev/null @@ -1 +0,0 @@ -../../../../../tools/build-docker-image \ No newline at end of file diff --git a/docker/centos/source/glance/glance-registry/config-external.sh b/docker/centos/source/glance/glance-registry/config-external.sh deleted file mode 120000 index cfcbd1391..000000000 --- a/docker/centos/source/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/source/glance/glance-registry/start.sh b/docker/centos/source/glance/glance-registry/start.sh deleted file mode 120000 index 1295cdc31..000000000 --- a/docker/centos/source/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