diff options
Diffstat (limited to 'docker/cinder/cinder-volume')
| -rw-r--r-- | docker/cinder/cinder-volume/Dockerfile.j2 | 11 | ||||
| -rwxr-xr-x | docker/cinder/cinder-volume/start.sh | 7 |
2 files changed, 4 insertions, 14 deletions
diff --git a/docker/cinder/cinder-volume/Dockerfile.j2 b/docker/cinder/cinder-volume/Dockerfile.j2 index 4eda4b981..5047124be 100644 --- a/docker/cinder/cinder-volume/Dockerfile.j2 +++ b/docker/cinder/cinder-volume/Dockerfile.j2 @@ -4,15 +4,12 @@ MAINTAINER Kolla Project (https://launchpad.net/kolla) {% if install_type == 'binary' %} {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} -RUN yum install -y lvm2 \ - scsi-target-utils \ - && yum clean all +RUN yum install -y \ + lvm2 \ + scsi-target-utils \ + && yum clean all {% endif %} {% endif %} -COPY ./start.sh / - -CMD ["/start.sh"] - {{ include_footer }} diff --git a/docker/cinder/cinder-volume/start.sh b/docker/cinder/cinder-volume/start.sh deleted file mode 100755 index a083e7bac..000000000 --- a/docker/cinder/cinder-volume/start.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/bash -set -o errexit - -# Loading common functions. -source /opt/kolla/kolla-common.sh - -exec $CMD |
