You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@crail.apache.org by pe...@apache.org on 2019/06/25 12:02:03 UTC
[incubator-crail] branch master updated (64ba8d4 -> 1b50994)
This is an automated email from the ASF dual-hosted git repository.
pepperjo pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-crail.git.
from 64ba8d4 Fix naming in Docker file
new e69660c [DOCKER] get libdisni version from jar version
new 1b50994 [DOCKER] update apt repository for RDMA build
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
docker/RDMA/Dockerfile | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
[incubator-crail] 01/02: [DOCKER] get libdisni version from jar
version
Posted by 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 && \
[incubator-crail] 02/02: [DOCKER] update apt repository for RDMA
build
Posted by 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 1b50994f1817e1e6e662f138d4512ef445b4d0bb
Author: Jonas Pfefferle <pe...@apache.org>
AuthorDate: Tue Jun 25 13:23:07 2019 +0200
[DOCKER] update apt repository for RDMA build
Always update apt repository before install otherwise
data from base container could be stale and installation will fail.
Signed-off-by: Jonas Pfefferle <pe...@apache.org>
---
docker/RDMA/Dockerfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/docker/RDMA/Dockerfile b/docker/RDMA/Dockerfile
index 52f7dd7..c161e83 100644
--- a/docker/RDMA/Dockerfile
+++ b/docker/RDMA/Dockerfile
@@ -18,7 +18,7 @@ FROM apache/incubator-crail:1.1
MAINTAINER Apache Crail <de...@crail.apache.org>
RUN echo "Crail-$LOG_COMMIT install rdma libraries and autotools" && \
- apt-get install -y --no-install-recommends \
+ apt-get update && apt-get install -y --no-install-recommends \
autoconf autotools-dev automake libtool make g++ \
librdmacm-dev libibverbs-dev ibverbs-providers