diff options
author | Kristian Aune <kraune@yahoo-inc.com> | 2017-06-14 08:45:41 +0200 |
---|---|---|
committer | Kristian Aune <kraune@yahoo-inc.com> | 2017-06-14 08:45:41 +0200 |
commit | 750ba14b05fd4b4e75475682fd5303ca692129f0 (patch) | |
tree | 1335668687f48ae60a71b53412c6d76a96cad561 | |
parent | 0d0e6ca025d9e0e3420fe3852406ff29f38d0a57 (diff) |
Add zstd to docker build and run image
- also bump dependencies after include path changes
-rw-r--r-- | dist/vespa.spec | 16 | ||||
-rw-r--r-- | docker/Dockerfile.build | 1 | ||||
-rw-r--r-- | docker/Dockerfile.run | 1 |
3 files changed, 10 insertions, 8 deletions
diff --git a/dist/vespa.spec b/dist/vespa.spec index 3093f261006..1b4bc307468 100644 --- a/dist/vespa.spec +++ b/dist/vespa.spec @@ -31,10 +31,10 @@ BuildRequires: java-1.8.0-openjdk-devel BuildRequires: openssl-devel BuildRequires: rpm-build BuildRequires: make -BuildRequires: vespa-boost-devel >= 1.59 -BuildRequires: vespa-cppunit-devel >= 1.12.1 -BuildRequires: vespa-libtorrent-devel >= 1.0.9 -BuildRequires: vespa-zookeeper-c-client-devel >= 3.4.8 +BuildRequires: vespa-boost-devel >= 1.59.0-6 +BuildRequires: vespa-cppunit-devel >= 1.12.1-6 +BuildRequires: vespa-libtorrent-devel >= 1.0.11-6 +BuildRequires: vespa-zookeeper-c-client-devel >= 3.4.9-6 BuildRequires: systemd Requires: epel-release Requires: Judy @@ -45,10 +45,10 @@ Requires: libicu Requires: llvm3.9 Requires: java-1.8.0-openjdk Requires: openssl -Requires: vespa-boost >= 1.59 -Requires: vespa-cppunit >= 1.12.1 -Requires: vespa-libtorrent >= 1.0.9 -Requires: vespa-zookeeper-c-client >= 3.4.8 +Requires: vespa-boost >= 1.59.0-6 +Requires: vespa-cppunit >= 1.12.1-6 +Requires: vespa-libtorrent >= 1.0.11-6 +Requires: vespa-zookeeper-c-client >= 3.4.9-6 Requires(pre): shadow-utils # Ugly workaround because vespamalloc/src/vespamalloc/malloc/mmap.cpp uses the private diff --git a/docker/Dockerfile.build b/docker/Dockerfile.build index eb38354c84b..4e1d5d8d4cb 100644 --- a/docker/Dockerfile.build +++ b/docker/Dockerfile.build @@ -14,6 +14,7 @@ RUN yum-config-manager --add-repo https://copr.fedorainfracloud.org/coprs/g/vesp ccache \ Judy-devel \ lz4-devel \ + libzstd-devel \ zlib-devel \ maven \ libicu-devel \ diff --git a/docker/Dockerfile.run b/docker/Dockerfile.run index 5f0dd1fd0cc..9de5953194e 100644 --- a/docker/Dockerfile.run +++ b/docker/Dockerfile.run @@ -8,6 +8,7 @@ RUN yum-config-manager --add-repo https://copr.fedorainfracloud.org/coprs/g/vesp Judy \ lz4 \ zlib \ + libzstd \ libicu \ llvm3.9 \ java-1.8.0-openjdk \ |