Skip to content

Commit

Permalink
common: add ndctl to docker files
Browse files Browse the repository at this point in the history
  • Loading branch information
lplewa committed Nov 28, 2017
1 parent 4f63dc0 commit dc03094
Show file tree
Hide file tree
Showing 3 changed files with 60 additions and 4 deletions.
9 changes: 7 additions & 2 deletions utils/docker/images/Dockerfile.fedora-25
Original file line number Diff line number Diff line change
Expand Up @@ -42,12 +42,17 @@ MAINTAINER wojciech.uss@intel.com
RUN dnf install -y git gcc clang openssh-server autoconf automake make \
wget tar lbzip2 passwd sudo pkgconfig findutils man libunwind-devel \
file rpm-build rpm-build-libs which fuse fuse-devel ncurses-devel \
libuv-devel glib2-devel libtool pandoc doxygen cmake gdb
libuv-devel glib2-devel libtool pandoc doxygen cmake gdb asciidoc \
kmod-devel xmlto libudev-devel libuuid-devel json-c-devel

# Install libndctl
COPY install-libndctl.sh install-libndctl.sh
RUN ./install-libndctl.sh

# Install valgrind
COPY install-valgrind.sh install-valgrind.sh
RUN ./install-valgrind.sh

# Install libfabric
COPY install-libfabric.sh install-libfabric.sh
RUN ./install-libfabric.sh
Expand Down
9 changes: 7 additions & 2 deletions utils/docker/images/Dockerfile.ubuntu-16.04
Original file line number Diff line number Diff line change
Expand Up @@ -43,12 +43,13 @@ RUN apt-get update && apt-get install -y software-properties-common \
libunwind8-dev autoconf \
devscripts pkg-config ssh git gcc clang debhelper sudo whois \
libc6-dbg libncurses5-dev libuv1-dev libfuse-dev libglib2.0-dev \
libtool pandoc doxygen graphviz clang-format-3.8 cmake ruby gdb
libtool pandoc doxygen graphviz clang-format-3.8 cmake ruby gdb \
libjson-c-dev asciidoc uuid-dev libkmod-dev libudev-dev

# Install valgrind
COPY install-valgrind.sh install-valgrind.sh
RUN ./install-valgrind.sh

# Install libfabric
COPY install-libfabric.sh install-libfabric.sh
RUN ./install-libfabric.sh
Expand All @@ -57,6 +58,10 @@ RUN ./install-libfabric.sh
COPY install-libcxx.sh install-libcxx.sh
RUN ./install-libcxx.sh

# Install libndctl
COPY install-libndctl.sh install-libndctl.sh
RUN ./install-libndctl.sh

# Add user
ENV USER nvmluser
ENV USERPASS nvmlpass
Expand Down
46 changes: 46 additions & 0 deletions utils/docker/images/install-libndctl.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
#!/usr/bin/env bash
#
# Copyright 2017, Intel Corporation
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions
# are met:
#
# * Redistributions of source code must retain the above copyright
# notice, this list of conditions and the following disclaimer.
#
# * Redistributions in binary form must reproduce the above copyright
# notice, this list of conditions and the following disclaimer in
# the documentation and/or other materials provided with the
# distribution.
#
# * Neither the name of the copyright holder nor the names of its
# contributors may be used to endorse or promote products derived
# from this software without specific prior written permission.
#
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

#
# install-libndctl.sh - installs libndctl
#

set -e

git clone -b pending --depth 1 https://github.com/pmem/ndctl.git
cd ndctl
./autogen.sh
./configure
make
make install
cd ..
rm -rf ndctl

0 comments on commit dc03094

Please sign in to comment.