[incubator-crail] 01/02: [DOCKER] get libdisni version from jar version

[pe...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

pepperjo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-crail.git

commit e69660c08658654e253125fd68d905208eda79f0
Author: Jonas Pfefferle <pe...@apache.org>
AuthorDate: Tue Jun 25 13:21:05 2019 +0200

    [DOCKER] get libdisni version from jar version
    
    Automatically get libdisni version from DiSNI jar.
    Before we had to manually update the DiSNI version
    for building the native library on every release.
    
    https://issues.apache.org/jira/projects/CRAIL/issues/CRAIL-100
    
    Signed-off-by: Jonas Pfefferle <pe...@apache.org>
---
 docker/RDMA/Dockerfile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/docker/RDMA/Dockerfile b/docker/RDMA/Dockerfile
index ab0bce9..52f7dd7 100644
--- a/docker/RDMA/Dockerfile
+++ b/docker/RDMA/Dockerfile
@@ -17,14 +17,14 @@
 FROM apache/incubator-crail:1.1
 MAINTAINER Apache Crail <de...@crail.apache.org>
 
-# TODO: automate update version
-ARG DISNI_COMMIT="v1.7"
-
 RUN echo "Crail-$LOG_COMMIT install rdma libraries and autotools" && \
     apt-get install -y --no-install-recommends \
     autoconf autotools-dev automake libtool make g++ \
     librdmacm-dev libibverbs-dev ibverbs-providers
 
+RUN echo "Retrieve DiSNI jar version to match native library build" && \
+    DISNI_COMMIT=v$(ls $CRAIL_HOME/jars/disni* | grep -oP "\d+\.\d+(?=\.jar$)")
+
 RUN echo "Crail-$LOG_COMMIT clone and build disni native library" && \
     cd && git clone https://github.com/zrlio/disni.git && \
     cd ~/disni/libdisni && \