summaryrefslogtreecommitdiffstats
path: root/gluster-object/CentOS/docker-gluster-swift/Dockerfile
diff options
context:
space:
mode:
authorHumble Devassy Chirammal <humble.devassy@gmail.com>2017-03-22 12:28:41 +0530
committerGitHub <noreply@github.com>2017-03-22 12:28:41 +0530
commitbd3aed1b4a11ed8816c6c556847c2fbba600837d (patch)
treea1dba72c5d6b6af48676e8c62a58b10ff4532b91 /gluster-object/CentOS/docker-gluster-swift/Dockerfile
parentf4b9c98f3c22cd1caeed6ff03bc04828f2fdc9a5 (diff)
parent9a86ba3da34bab3347029951b71333dcf46c8688 (diff)
downloadgluster-bd3aed1b4a11ed8816c6c556847c2fbba600837d.tar.gz
gluster-bd3aed1b4a11ed8816c6c556847c2fbba600837d.tar.bz2
gluster-bd3aed1b4a11ed8816c6c556847c2fbba600837d.tar.xz
gluster-bd3aed1b4a11ed8816c6c556847c2fbba600837d.zip
Merge pull request #35 from SaravanaStorageNetwork/pass_argument
Pass gluster volume as argument while running docker
Diffstat (limited to 'gluster-object/CentOS/docker-gluster-swift/Dockerfile')
-rw-r--r--gluster-object/CentOS/docker-gluster-swift/Dockerfile12
1 files changed, 9 insertions, 3 deletions
diff --git a/gluster-object/CentOS/docker-gluster-swift/Dockerfile b/gluster-object/CentOS/docker-gluster-swift/Dockerfile
index 78be0b7..65599ec 100644
--- a/gluster-object/CentOS/docker-gluster-swift/Dockerfile
+++ b/gluster-object/CentOS/docker-gluster-swift/Dockerfile
@@ -37,9 +37,6 @@ RUN git clone git://review.gluster.org/gluster-swift /tmp/gluster-swift && \
# Gluster volumes will be mounted *under* this directory.
VOLUME /mnt/gluster-object
-# volumes to be exposed as object storage is present in swift-volumes file
-COPY etc/sysconfig/swift-volumes /etc/sysconfig/
-
# Copy systemd scripts
COPY swift-gen-builders.service /lib/systemd/system/
COPY swift-proxy.service /lib/systemd/system/
@@ -50,6 +47,13 @@ COPY swift-object.service /lib/systemd/system/
# Replace openstack swift conf files with local gluster-swift ones
COPY etc/swift/* /etc/swift/
+# To update volume name used by swift-gen-builders service
+COPY update_gluster_vol.sh /usr/local/bin/update_gluster_vol.sh
+RUN chmod +x /usr/local/bin/update_gluster_vol.sh
+
+# volumes to be exposed as object storage is present in swift-volumes file
+COPY etc/sysconfig/swift-volumes /etc/sysconfig/swift-volumes
+
# The proxy server listens on port 8080
EXPOSE 8080
@@ -62,4 +66,6 @@ RUN systemctl enable swift-proxy.service
RUN systemctl enable swift-account.service
RUN systemctl enable swift-container.service
RUN systemctl enable swift-object.service
+
+ENTRYPOINT ["/usr/local/bin/update_gluster_vol.sh"]
CMD ["/usr/sbin/init"]