diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-01-28 10:14:21 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-01-28 10:14:21 +0000 |
| commit | af7092151a38308029e1636559be7b265aee7916 (patch) | |
| tree | d5fe9f08c52aa711e636b50bca81225288b3d4e9 | |
| parent | 4caf6fafcaa1fd47ac99b1db20fb363ed1f54181 (diff) | |
| parent | 76c88bbd1e2316e7568813119b8e209b853118aa (diff) | |
| download | kolla-af7092151a38308029e1636559be7b265aee7916.tar.gz kolla-af7092151a38308029e1636559be7b265aee7916.zip | |
Merge "Fix swift build issue"
| -rw-r--r-- | docker/swift/swift-base/Dockerfile.j2 | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/docker/swift/swift-base/Dockerfile.j2 b/docker/swift/swift-base/Dockerfile.j2 index 786e71535..0fbe29973 100644 --- a/docker/swift/swift-base/Dockerfile.j2 +++ b/docker/swift/swift-base/Dockerfile.j2 @@ -9,6 +9,19 @@ RUN yum -y install openstack-swift \ {% endif %} {% elif install_type == 'source' %} + {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} + +RUN yum -y install \ + liberasurecode-devel \ + && yum clean all + + {% elif base_distro in ['ubuntu'] %} + +RUN apt-get install -y --no-install-recommends \ + liberasurecode-dev \ + && apt-get clean + + {% endif %} ADD swift-base-archive /swift-base-source RUN ln -s swift-base-source/* swift \ |