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/openvswitch/ovs-base/Dockerfile | 5 ----- docker/centos/binary/openvswitch/ovs-base/build | 1 - docker/centos/binary/openvswitch/ovs-db-server/Dockerfile | 7 ------- docker/centos/binary/openvswitch/ovs-db-server/build | 1 - docker/centos/binary/openvswitch/ovs-db-server/config-external.sh | 1 - docker/centos/binary/openvswitch/ovs-db-server/start.sh | 1 - docker/centos/binary/openvswitch/ovs-vswitchd/Dockerfile | 7 ------- docker/centos/binary/openvswitch/ovs-vswitchd/build | 1 - docker/centos/binary/openvswitch/ovs-vswitchd/config-external.sh | 1 - .../binary/openvswitch/ovs-vswitchd/ovs_ensure_configured.sh | 1 - docker/centos/binary/openvswitch/ovs-vswitchd/start.sh | 1 - 11 files changed, 27 deletions(-) delete mode 100644 docker/centos/binary/openvswitch/ovs-base/Dockerfile delete mode 120000 docker/centos/binary/openvswitch/ovs-base/build delete mode 100644 docker/centos/binary/openvswitch/ovs-db-server/Dockerfile delete mode 120000 docker/centos/binary/openvswitch/ovs-db-server/build delete mode 120000 docker/centos/binary/openvswitch/ovs-db-server/config-external.sh delete mode 120000 docker/centos/binary/openvswitch/ovs-db-server/start.sh delete mode 100644 docker/centos/binary/openvswitch/ovs-vswitchd/Dockerfile delete mode 120000 docker/centos/binary/openvswitch/ovs-vswitchd/build delete mode 120000 docker/centos/binary/openvswitch/ovs-vswitchd/config-external.sh delete mode 120000 docker/centos/binary/openvswitch/ovs-vswitchd/ovs_ensure_configured.sh delete mode 120000 docker/centos/binary/openvswitch/ovs-vswitchd/start.sh (limited to 'docker/centos/binary/openvswitch') diff --git a/docker/centos/binary/openvswitch/ovs-base/Dockerfile b/docker/centos/binary/openvswitch/ovs-base/Dockerfile deleted file mode 100644 index 7d4ade54c..000000000 --- a/docker/centos/binary/openvswitch/ovs-base/Dockerfile +++ /dev/null @@ -1,5 +0,0 @@ -FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%base:%%KOLLA_TAG%% -MAINTAINER Kolla Project (https://launchpad.net/kolla) - -RUN yum install -y openvswitch \ - && yum clean all diff --git a/docker/centos/binary/openvswitch/ovs-base/build b/docker/centos/binary/openvswitch/ovs-base/build deleted file mode 120000 index ec1913803..000000000 --- a/docker/centos/binary/openvswitch/ovs-base/build +++ /dev/null @@ -1 +0,0 @@ -../../../../../tools/build-docker-image \ No newline at end of file diff --git a/docker/centos/binary/openvswitch/ovs-db-server/Dockerfile b/docker/centos/binary/openvswitch/ovs-db-server/Dockerfile deleted file mode 100644 index 8dcc5dc67..000000000 --- a/docker/centos/binary/openvswitch/ovs-db-server/Dockerfile +++ /dev/null @@ -1,7 +0,0 @@ -FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%ovs-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/openvswitch/ovs-db-server/build b/docker/centos/binary/openvswitch/ovs-db-server/build deleted file mode 120000 index ec1913803..000000000 --- a/docker/centos/binary/openvswitch/ovs-db-server/build +++ /dev/null @@ -1 +0,0 @@ -../../../../../tools/build-docker-image \ No newline at end of file diff --git a/docker/centos/binary/openvswitch/ovs-db-server/config-external.sh b/docker/centos/binary/openvswitch/ovs-db-server/config-external.sh deleted file mode 120000 index 36670d77d..000000000 --- a/docker/centos/binary/openvswitch/ovs-db-server/config-external.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../common/openvswitch/ovs-db-server/config-external.sh \ No newline at end of file diff --git a/docker/centos/binary/openvswitch/ovs-db-server/start.sh b/docker/centos/binary/openvswitch/ovs-db-server/start.sh deleted file mode 120000 index 145b2426f..000000000 --- a/docker/centos/binary/openvswitch/ovs-db-server/start.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../common/openvswitch/ovs-db-server/start.sh \ No newline at end of file diff --git a/docker/centos/binary/openvswitch/ovs-vswitchd/Dockerfile b/docker/centos/binary/openvswitch/ovs-vswitchd/Dockerfile deleted file mode 100644 index bb7ec8c67..000000000 --- a/docker/centos/binary/openvswitch/ovs-vswitchd/Dockerfile +++ /dev/null @@ -1,7 +0,0 @@ -FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%ovs-base:%%KOLLA_TAG%% -MAINTAINER Kolla Project (https://launchpad.net/kolla) - -COPY start.sh / -COPY ovs_ensure_configured.sh config-external.sh /opt/kolla/ - -CMD ["/start.sh"] diff --git a/docker/centos/binary/openvswitch/ovs-vswitchd/build b/docker/centos/binary/openvswitch/ovs-vswitchd/build deleted file mode 120000 index ec1913803..000000000 --- a/docker/centos/binary/openvswitch/ovs-vswitchd/build +++ /dev/null @@ -1 +0,0 @@ -../../../../../tools/build-docker-image \ No newline at end of file diff --git a/docker/centos/binary/openvswitch/ovs-vswitchd/config-external.sh b/docker/centos/binary/openvswitch/ovs-vswitchd/config-external.sh deleted file mode 120000 index 39b5c7dd6..000000000 --- a/docker/centos/binary/openvswitch/ovs-vswitchd/config-external.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../common/openvswitch/ovs-vswitchd/config-external.sh \ No newline at end of file diff --git a/docker/centos/binary/openvswitch/ovs-vswitchd/ovs_ensure_configured.sh b/docker/centos/binary/openvswitch/ovs-vswitchd/ovs_ensure_configured.sh deleted file mode 120000 index 19efaf06a..000000000 --- a/docker/centos/binary/openvswitch/ovs-vswitchd/ovs_ensure_configured.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../common/openvswitch/ovs-vswitchd/ovs_ensure_configured.sh \ No newline at end of file diff --git a/docker/centos/binary/openvswitch/ovs-vswitchd/start.sh b/docker/centos/binary/openvswitch/ovs-vswitchd/start.sh deleted file mode 120000 index c1038c338..000000000 --- a/docker/centos/binary/openvswitch/ovs-vswitchd/start.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../common/openvswitch/ovs-vswitchd/start.sh \ No newline at end of file -- cgit v1.2.3