diff options
| author | Steven Dake <stdake@cisco.com> | 2015-08-27 19:23:49 -0700 |
|---|---|---|
| committer | Steven Dake <stdake@cisco.com> | 2015-08-28 00:50:30 -0700 |
| commit | f895ee07cc5c1030e32854cf9a4e91bbeaf4de12 (patch) | |
| tree | cc7d17c2c63bf83f6a983553b8729f67abeac58d /docker/centos/source/swift | |
| parent | 5c82e0c90ce0fedf523b11b0b933f2276edf8f46 (diff) | |
| download | kolla-f895ee07cc5c1030e32854cf9a4e91bbeaf4de12.tar.gz kolla-f895ee07cc5c1030e32854cf9a4e91bbeaf4de12.zip | |
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
Diffstat (limited to 'docker/centos/source/swift')
39 files changed, 0 insertions, 118 deletions
diff --git a/docker/centos/source/swift/swift-account-server/Dockerfile b/docker/centos/source/swift/swift-account-server/Dockerfile deleted file mode 100644 index c923e339e..000000000 --- a/docker/centos/source/swift/swift-account-server/Dockerfile +++ /dev/null @@ -1,7 +0,0 @@ -FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%swift-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/swift/swift-account-server/build b/docker/centos/source/swift/swift-account-server/build deleted file mode 120000 index ec1913803..000000000 --- a/docker/centos/source/swift/swift-account-server/build +++ /dev/null @@ -1 +0,0 @@ -../../../../../tools/build-docker-image
\ No newline at end of file diff --git a/docker/centos/source/swift/swift-account-server/config-external.sh b/docker/centos/source/swift/swift-account-server/config-external.sh deleted file mode 120000 index 93a15ca3b..000000000 --- a/docker/centos/source/swift/swift-account-server/config-external.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../../docker/common/swift/swift-account-server/config-external.sh
\ No newline at end of file diff --git a/docker/centos/source/swift/swift-account-server/start.sh b/docker/centos/source/swift/swift-account-server/start.sh deleted file mode 120000 index acf6b18d7..000000000 --- a/docker/centos/source/swift/swift-account-server/start.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../../docker/common/swift/swift-account-server/start.sh
\ No newline at end of file diff --git a/docker/centos/source/swift/swift-base/.buildinfo b/docker/centos/source/swift/swift-base/.buildinfo deleted file mode 100644 index ca6e05ede..000000000 --- a/docker/centos/source/swift/swift-base/.buildinfo +++ /dev/null @@ -1,10 +0,0 @@ -# Build info specific to this image. All values can be overridden in .buildconf - -COMPONENT=swift -SOURCE_INSTALL_AVAILABLE=1 - -# Used for git install method -: ${CLONE_FROM:=https://github.com/openstack/swift} - -# Used for curl install method -: ${TARBALL_URI:=http://tarballs.openstack.org/swift/swift-master.tar.gz} diff --git a/docker/centos/source/swift/swift-base/Dockerfile b/docker/centos/source/swift/swift-base/Dockerfile deleted file mode 100644 index 2a983963b..000000000 --- a/docker/centos/source/swift/swift-base/Dockerfile +++ /dev/null @@ -1,19 +0,0 @@ -FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%base:%%KOLLA_TAG%% -MAINTAINER Kolla Project (https://launchpad.net/kolla) - -ADD ./swift.tar / -RUN ln -s /swift-* /swift - -RUN cd /swift \ - && useradd --user-group swift \ - && pip install -r requirements.txt \ - && pip install /swift \ - && mkdir /etc/swift /var/log/swift \ - && cp -r /swift/etc/* /etc/swift/ \ - && rm -rf /root/.cache - -COPY config-swift.sh build-swift-ring.py /opt/kolla/ - -RUN mkdir /opt/swift - -CMD ["/start.sh"] diff --git a/docker/centos/source/swift/swift-base/build b/docker/centos/source/swift/swift-base/build deleted file mode 120000 index ec1913803..000000000 --- a/docker/centos/source/swift/swift-base/build +++ /dev/null @@ -1 +0,0 @@ -../../../../../tools/build-docker-image
\ No newline at end of file diff --git a/docker/centos/source/swift/swift-base/config-swift.sh b/docker/centos/source/swift/swift-base/config-swift.sh deleted file mode 120000 index fb883f482..000000000 --- a/docker/centos/source/swift/swift-base/config-swift.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../../docker/common/swift/swift-base/config-swift.sh
\ No newline at end of file diff --git a/docker/centos/source/swift/swift-container-server/Dockerfile b/docker/centos/source/swift/swift-container-server/Dockerfile deleted file mode 100644 index c923e339e..000000000 --- a/docker/centos/source/swift/swift-container-server/Dockerfile +++ /dev/null @@ -1,7 +0,0 @@ -FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%swift-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/swift/swift-container-server/build b/docker/centos/source/swift/swift-container-server/build deleted file mode 120000 index ec1913803..000000000 --- a/docker/centos/source/swift/swift-container-server/build +++ /dev/null @@ -1 +0,0 @@ -../../../../../tools/build-docker-image
\ No newline at end of file diff --git a/docker/centos/source/swift/swift-container-server/config-external.sh b/docker/centos/source/swift/swift-container-server/config-external.sh deleted file mode 120000 index 8fa814ca7..000000000 --- a/docker/centos/source/swift/swift-container-server/config-external.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../../docker/common/swift/swift-container-server/config-external.sh
\ No newline at end of file diff --git a/docker/centos/source/swift/swift-container-server/start.sh b/docker/centos/source/swift/swift-container-server/start.sh deleted file mode 120000 index b7d3cd9fc..000000000 --- a/docker/centos/source/swift/swift-container-server/start.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../../docker/common/swift/swift-container-server/start.sh
\ No newline at end of file diff --git a/docker/centos/source/swift/swift-object-auditor/Dockerfile b/docker/centos/source/swift/swift-object-auditor/Dockerfile deleted file mode 100644 index eb070cce9..000000000 --- a/docker/centos/source/swift/swift-object-auditor/Dockerfile +++ /dev/null @@ -1,7 +0,0 @@ -FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%swift-object-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/swift/swift-object-auditor/build b/docker/centos/source/swift/swift-object-auditor/build deleted file mode 120000 index ec1913803..000000000 --- a/docker/centos/source/swift/swift-object-auditor/build +++ /dev/null @@ -1 +0,0 @@ -../../../../../tools/build-docker-image
\ No newline at end of file diff --git a/docker/centos/source/swift/swift-object-auditor/config-external.sh b/docker/centos/source/swift/swift-object-auditor/config-external.sh deleted file mode 120000 index 1adf26bcb..000000000 --- a/docker/centos/source/swift/swift-object-auditor/config-external.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../../docker/common/swift/swift-object-auditor/config-external.sh
\ No newline at end of file diff --git a/docker/centos/source/swift/swift-object-auditor/start.sh b/docker/centos/source/swift/swift-object-auditor/start.sh deleted file mode 120000 index 5ef316559..000000000 --- a/docker/centos/source/swift/swift-object-auditor/start.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../../docker/common/swift/swift-object-auditor/start.sh
\ No newline at end of file diff --git a/docker/centos/source/swift/swift-object-base/Dockerfile b/docker/centos/source/swift/swift-object-base/Dockerfile deleted file mode 100644 index 600d9d651..000000000 --- a/docker/centos/source/swift/swift-object-base/Dockerfile +++ /dev/null @@ -1,4 +0,0 @@ -FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%swift-base:%%KOLLA_TAG%% -MAINTAINER Kolla Project (https://launchpad.net/kolla) - -COPY config-swift-object.sh /opt/kolla/ diff --git a/docker/centos/source/swift/swift-object-base/build b/docker/centos/source/swift/swift-object-base/build deleted file mode 120000 index ec1913803..000000000 --- a/docker/centos/source/swift/swift-object-base/build +++ /dev/null @@ -1 +0,0 @@ -../../../../../tools/build-docker-image
\ No newline at end of file diff --git a/docker/centos/source/swift/swift-object-base/config-swift-object.sh b/docker/centos/source/swift/swift-object-base/config-swift-object.sh deleted file mode 120000 index a289b4d0d..000000000 --- a/docker/centos/source/swift/swift-object-base/config-swift-object.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../../docker/common/swift/swift-object-base/config-swift-object.sh
\ No newline at end of file diff --git a/docker/centos/source/swift/swift-object-expirer/Dockerfile b/docker/centos/source/swift/swift-object-expirer/Dockerfile deleted file mode 100644 index eb070cce9..000000000 --- a/docker/centos/source/swift/swift-object-expirer/Dockerfile +++ /dev/null @@ -1,7 +0,0 @@ -FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%swift-object-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/swift/swift-object-expirer/build b/docker/centos/source/swift/swift-object-expirer/build deleted file mode 120000 index ec1913803..000000000 --- a/docker/centos/source/swift/swift-object-expirer/build +++ /dev/null @@ -1 +0,0 @@ -../../../../../tools/build-docker-image
\ No newline at end of file diff --git a/docker/centos/source/swift/swift-object-expirer/config-external.sh b/docker/centos/source/swift/swift-object-expirer/config-external.sh deleted file mode 120000 index 7f8d3e37e..000000000 --- a/docker/centos/source/swift/swift-object-expirer/config-external.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../../docker/common/swift/swift-object-expirer/config-external.sh
\ No newline at end of file diff --git a/docker/centos/source/swift/swift-object-expirer/start.sh b/docker/centos/source/swift/swift-object-expirer/start.sh deleted file mode 120000 index 3b9a9c3ee..000000000 --- a/docker/centos/source/swift/swift-object-expirer/start.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../../docker/common/swift/swift-object-expirer/start.sh
\ No newline at end of file diff --git a/docker/centos/source/swift/swift-object-replicator/Dockerfile b/docker/centos/source/swift/swift-object-replicator/Dockerfile deleted file mode 100644 index eb070cce9..000000000 --- a/docker/centos/source/swift/swift-object-replicator/Dockerfile +++ /dev/null @@ -1,7 +0,0 @@ -FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%swift-object-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/swift/swift-object-replicator/build b/docker/centos/source/swift/swift-object-replicator/build deleted file mode 120000 index ec1913803..000000000 --- a/docker/centos/source/swift/swift-object-replicator/build +++ /dev/null @@ -1 +0,0 @@ -../../../../../tools/build-docker-image
\ No newline at end of file diff --git a/docker/centos/source/swift/swift-object-replicator/config-external.sh b/docker/centos/source/swift/swift-object-replicator/config-external.sh deleted file mode 120000 index 69e793df4..000000000 --- a/docker/centos/source/swift/swift-object-replicator/config-external.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../../docker/common/swift/swift-object-replicator/config-external.sh
\ No newline at end of file diff --git a/docker/centos/source/swift/swift-object-replicator/start.sh b/docker/centos/source/swift/swift-object-replicator/start.sh deleted file mode 120000 index da27b6312..000000000 --- a/docker/centos/source/swift/swift-object-replicator/start.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../../docker/common/swift/swift-object-replicator/start.sh
\ No newline at end of file diff --git a/docker/centos/source/swift/swift-object-server/Dockerfile b/docker/centos/source/swift/swift-object-server/Dockerfile deleted file mode 100644 index eb070cce9..000000000 --- a/docker/centos/source/swift/swift-object-server/Dockerfile +++ /dev/null @@ -1,7 +0,0 @@ -FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%swift-object-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/swift/swift-object-server/build b/docker/centos/source/swift/swift-object-server/build deleted file mode 120000 index ec1913803..000000000 --- a/docker/centos/source/swift/swift-object-server/build +++ /dev/null @@ -1 +0,0 @@ -../../../../../tools/build-docker-image
\ No newline at end of file diff --git a/docker/centos/source/swift/swift-object-server/config-external.sh b/docker/centos/source/swift/swift-object-server/config-external.sh deleted file mode 120000 index a9213fffa..000000000 --- a/docker/centos/source/swift/swift-object-server/config-external.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../../docker/common/swift/swift-object-server/config-external.sh
\ No newline at end of file diff --git a/docker/centos/source/swift/swift-object-server/start.sh b/docker/centos/source/swift/swift-object-server/start.sh deleted file mode 120000 index 7e47f8018..000000000 --- a/docker/centos/source/swift/swift-object-server/start.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../../docker/common/swift/swift-object-server/start.sh
\ No newline at end of file diff --git a/docker/centos/source/swift/swift-object-updater/Dockerfile b/docker/centos/source/swift/swift-object-updater/Dockerfile deleted file mode 100644 index eb070cce9..000000000 --- a/docker/centos/source/swift/swift-object-updater/Dockerfile +++ /dev/null @@ -1,7 +0,0 @@ -FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%swift-object-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/swift/swift-object-updater/build b/docker/centos/source/swift/swift-object-updater/build deleted file mode 120000 index ec1913803..000000000 --- a/docker/centos/source/swift/swift-object-updater/build +++ /dev/null @@ -1 +0,0 @@ -../../../../../tools/build-docker-image
\ No newline at end of file diff --git a/docker/centos/source/swift/swift-object-updater/config-external.sh b/docker/centos/source/swift/swift-object-updater/config-external.sh deleted file mode 120000 index 94ba9e60c..000000000 --- a/docker/centos/source/swift/swift-object-updater/config-external.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../../docker/common/swift/swift-object-updater/config-external.sh
\ No newline at end of file diff --git a/docker/centos/source/swift/swift-object-updater/start.sh b/docker/centos/source/swift/swift-object-updater/start.sh deleted file mode 120000 index 2e78e5c09..000000000 --- a/docker/centos/source/swift/swift-object-updater/start.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../../docker/common/swift/swift-object-updater/start.sh
\ No newline at end of file diff --git a/docker/centos/source/swift/swift-proxy-server/Dockerfile b/docker/centos/source/swift/swift-proxy-server/Dockerfile deleted file mode 100644 index cbd4357f3..000000000 --- a/docker/centos/source/swift/swift-proxy-server/Dockerfile +++ /dev/null @@ -1,8 +0,0 @@ -FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%swift-base:%%KOLLA_TAG%% -MAINTAINER Kolla Project (https://launchpad.net/kolla) - - -COPY ./start.sh /start.sh -COPY config-external.sh /opt/kolla/ - -CMD ["/start.sh"] diff --git a/docker/centos/source/swift/swift-proxy-server/build b/docker/centos/source/swift/swift-proxy-server/build deleted file mode 120000 index ec1913803..000000000 --- a/docker/centos/source/swift/swift-proxy-server/build +++ /dev/null @@ -1 +0,0 @@ -../../../../../tools/build-docker-image
\ No newline at end of file diff --git a/docker/centos/source/swift/swift-proxy-server/config-external.sh b/docker/centos/source/swift/swift-proxy-server/config-external.sh deleted file mode 120000 index 178516af5..000000000 --- a/docker/centos/source/swift/swift-proxy-server/config-external.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../../docker/common/swift/swift-proxy-server/config-external.sh
\ No newline at end of file diff --git a/docker/centos/source/swift/swift-proxy-server/start.sh b/docker/centos/source/swift/swift-proxy-server/start.sh deleted file mode 120000 index 63d0ec91a..000000000 --- a/docker/centos/source/swift/swift-proxy-server/start.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../../docker/common/swift/swift-proxy-server/start.sh
\ No newline at end of file |
