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/murano/murano-api/Dockerfile | 8 -------- docker/centos/source/murano/murano-api/build | 1 - docker/centos/source/murano/murano-api/config-external.sh | 1 - docker/centos/source/murano/murano-api/start.sh | 1 - docker/centos/source/murano/murano-base/.buildinfo | 10 ---------- docker/centos/source/murano/murano-base/Dockerfile | 15 --------------- docker/centos/source/murano/murano-base/build | 1 - docker/centos/source/murano/murano-engine/Dockerfile | 8 -------- docker/centos/source/murano/murano-engine/build | 1 - .../centos/source/murano/murano-engine/config-external.sh | 1 - docker/centos/source/murano/murano-engine/start.sh | 1 - 11 files changed, 48 deletions(-) delete mode 100644 docker/centos/source/murano/murano-api/Dockerfile delete mode 120000 docker/centos/source/murano/murano-api/build delete mode 120000 docker/centos/source/murano/murano-api/config-external.sh delete mode 120000 docker/centos/source/murano/murano-api/start.sh delete mode 100644 docker/centos/source/murano/murano-base/.buildinfo delete mode 100644 docker/centos/source/murano/murano-base/Dockerfile delete mode 120000 docker/centos/source/murano/murano-base/build delete mode 100644 docker/centos/source/murano/murano-engine/Dockerfile delete mode 120000 docker/centos/source/murano/murano-engine/build delete mode 120000 docker/centos/source/murano/murano-engine/config-external.sh delete mode 120000 docker/centos/source/murano/murano-engine/start.sh (limited to 'docker/centos/source/murano') diff --git a/docker/centos/source/murano/murano-api/Dockerfile b/docker/centos/source/murano/murano-api/Dockerfile deleted file mode 100644 index a838fa8ac..000000000 --- a/docker/centos/source/murano/murano-api/Dockerfile +++ /dev/null @@ -1,8 +0,0 @@ -FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%murano-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/murano/murano-api/build b/docker/centos/source/murano/murano-api/build deleted file mode 120000 index ec1913803..000000000 --- a/docker/centos/source/murano/murano-api/build +++ /dev/null @@ -1 +0,0 @@ -../../../../../tools/build-docker-image \ No newline at end of file diff --git a/docker/centos/source/murano/murano-api/config-external.sh b/docker/centos/source/murano/murano-api/config-external.sh deleted file mode 120000 index 6b73e957f..000000000 --- a/docker/centos/source/murano/murano-api/config-external.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../common/murano/murano-api/config-external.sh \ No newline at end of file diff --git a/docker/centos/source/murano/murano-api/start.sh b/docker/centos/source/murano/murano-api/start.sh deleted file mode 120000 index bcf6f43e7..000000000 --- a/docker/centos/source/murano/murano-api/start.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../common/murano/murano-api/start.sh \ No newline at end of file diff --git a/docker/centos/source/murano/murano-base/.buildinfo b/docker/centos/source/murano/murano-base/.buildinfo deleted file mode 100644 index 4806db155..000000000 --- a/docker/centos/source/murano/murano-base/.buildinfo +++ /dev/null @@ -1,10 +0,0 @@ -# Build info specific to this image. All values can be overridden in .buildconf - -COMPONENT=murano -SOURCE_INSTALL_AVAILABLE=1 - -# Used for git install method -: ${CLONE_FROM:=https://github.com/openstack/murano} - -# Used for curl install method -: ${TARBALL_URI:=http://tarballs.openstack.org/murano/murano-master.tar.gz} diff --git a/docker/centos/source/murano/murano-base/Dockerfile b/docker/centos/source/murano/murano-base/Dockerfile deleted file mode 100644 index 21de3ece3..000000000 --- a/docker/centos/source/murano/murano-base/Dockerfile +++ /dev/null @@ -1,15 +0,0 @@ -FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%base:%%KOLLA_TAG%% -MAINTAINER Kolla Project (https://launchpad.net/kolla) - -ADD ./murano.tar / -RUN ln -s /murano-* /murano - -RUN cd /murano \ - && pip install -r requirements.txt \ - && pip install /murano \ - && mkdir /etc/murano \ - && cd /murano \ - && tox -e genconfig \ - && cp -r etc/murano/* /etc/murano/ \ - && cp etc/murano/murano.conf.sample /etc/murano/murano.conf \ - && rm -rf /root/.cache diff --git a/docker/centos/source/murano/murano-base/build b/docker/centos/source/murano/murano-base/build deleted file mode 120000 index ec1913803..000000000 --- a/docker/centos/source/murano/murano-base/build +++ /dev/null @@ -1 +0,0 @@ -../../../../../tools/build-docker-image \ No newline at end of file diff --git a/docker/centos/source/murano/murano-engine/Dockerfile b/docker/centos/source/murano/murano-engine/Dockerfile deleted file mode 100644 index a838fa8ac..000000000 --- a/docker/centos/source/murano/murano-engine/Dockerfile +++ /dev/null @@ -1,8 +0,0 @@ -FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%murano-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/murano/murano-engine/build b/docker/centos/source/murano/murano-engine/build deleted file mode 120000 index ec1913803..000000000 --- a/docker/centos/source/murano/murano-engine/build +++ /dev/null @@ -1 +0,0 @@ -../../../../../tools/build-docker-image \ No newline at end of file diff --git a/docker/centos/source/murano/murano-engine/config-external.sh b/docker/centos/source/murano/murano-engine/config-external.sh deleted file mode 120000 index 1c8e0612c..000000000 --- a/docker/centos/source/murano/murano-engine/config-external.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../common/murano/murano-engine/config-external.sh \ No newline at end of file diff --git a/docker/centos/source/murano/murano-engine/start.sh b/docker/centos/source/murano/murano-engine/start.sh deleted file mode 120000 index a4b0147fb..000000000 --- a/docker/centos/source/murano/murano-engine/start.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../common/murano/murano-engine/start.sh \ No newline at end of file -- cgit v1.2.3