aboutsummaryrefslogtreecommitdiff
path: root/docker/centos/binary/swift/swift-proxy-server
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-07-31 17:52:43 +0000
committerGerrit Code Review <review@openstack.org>2015-07-31 17:52:43 +0000
commita20fbed2520db9b1ab0bde80acf9b59466ec56f6 (patch)
tree8c1ecd5c4ef88b30dfb008c35b67e85512f444d0 /docker/centos/binary/swift/swift-proxy-server
parent2887c6d2e4d511888d9156668e2b75b48d58add8 (diff)
parent5e28eb8496c356f2074c21d72b52906451696e12 (diff)
downloadkolla-a20fbed2520db9b1ab0bde80acf9b59466ec56f6.tar.gz
kolla-a20fbed2520db9b1ab0bde80acf9b59466ec56f6.zip
Merge "Implement Swift Containers"
Diffstat (limited to 'docker/centos/binary/swift/swift-proxy-server')
-rw-r--r--docker/centos/binary/swift/swift-proxy-server/Dockerfile2
l---------docker/centos/binary/swift/swift-proxy-server/config-external.sh2
l---------docker/centos/binary/swift/swift-proxy-server/config-internal.sh2
l---------docker/centos/binary/swift/swift-proxy-server/start.sh2
4 files changed, 5 insertions, 3 deletions
diff --git a/docker/centos/binary/swift/swift-proxy-server/Dockerfile b/docker/centos/binary/swift/swift-proxy-server/Dockerfile
index 4c407ea82..4f8b27b49 100644
--- a/docker/centos/binary/swift/swift-proxy-server/Dockerfile
+++ b/docker/centos/binary/swift/swift-proxy-server/Dockerfile
@@ -1,6 +1,8 @@
FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%swift-base:%%KOLLA_TAG%%
MAINTAINER Kolla Project (https://launchpad.net/kolla)
+RUN yum -y install openstack-swift-proxy && yum clean all
+
COPY ./start.sh /start.sh
COPY config-internal.sh config-external.sh /opt/kolla/
diff --git a/docker/centos/binary/swift/swift-proxy-server/config-external.sh b/docker/centos/binary/swift/swift-proxy-server/config-external.sh
index 04e1c640f..178516af5 120000
--- a/docker/centos/binary/swift/swift-proxy-server/config-external.sh
+++ b/docker/centos/binary/swift/swift-proxy-server/config-external.sh
@@ -1 +1 @@
-../../../../common/swift/swift-proxy-server/config-external.sh \ No newline at end of file
+../../../../../docker/common/swift/swift-proxy-server/config-external.sh \ No newline at end of file
diff --git a/docker/centos/binary/swift/swift-proxy-server/config-internal.sh b/docker/centos/binary/swift/swift-proxy-server/config-internal.sh
index f95866fdd..a33b6be4f 120000
--- a/docker/centos/binary/swift/swift-proxy-server/config-internal.sh
+++ b/docker/centos/binary/swift/swift-proxy-server/config-internal.sh
@@ -1 +1 @@
-../../../../common/swift/swift-proxy-server/config-internal.sh \ No newline at end of file
+../../../../../docker/common/swift/swift-proxy-server/config-internal.sh \ No newline at end of file
diff --git a/docker/centos/binary/swift/swift-proxy-server/start.sh b/docker/centos/binary/swift/swift-proxy-server/start.sh
index 6a5581a46..63d0ec91a 120000
--- a/docker/centos/binary/swift/swift-proxy-server/start.sh
+++ b/docker/centos/binary/swift/swift-proxy-server/start.sh
@@ -1 +1 @@
-../../../../common/swift/swift-proxy-server/start.sh \ No newline at end of file
+../../../../../docker/common/swift/swift-proxy-server/start.sh \ No newline at end of file