From 6a3fe8677113008094ddc224ed1bacef8442d099 Mon Sep 17 00:00:00 2001
From: Christian Kniep <christian@qnib.org>
Date: Tue, 8 Aug 2017 13:40:03 +0200
Subject: [PATCH 1/2] add Dockerfile

---
 .dockerignore |  1 +
 Dockerfile    | 37 +++++++++++++++++++++++++++++++++++++
 2 files changed, 38 insertions(+)
 create mode 100644 .dockerignore
 create mode 100644 Dockerfile

diff --git a/.dockerignore b/.dockerignore
new file mode 100644
index 0000000..9414382
--- /dev/null
+++ b/.dockerignore
@@ -0,0 +1 @@
+Dockerfile
diff --git a/Dockerfile b/Dockerfile
new file mode 100644
index 0000000..a88bf00
--- /dev/null
+++ b/Dockerfile
@@ -0,0 +1,37 @@
+FROM qnib/uplain-init:14.04 AS hwloc
+
+RUN apt-get update \
+ && apt-get install -y cmake wget patch automake libcairo-dev
+
+## hwloc
+ARG HWLOC_URL=https://www.open-mpi.org/software/hwloc
+ARG HWLOC_VER=1.9
+ARG HWLOC_VER_PATCH=1
+RUN echo ${HWLOC_URL}/v${HWLOC_VER}/downloads/hwloc-${HWLOC_VER}.${HWLOC_VER_PATCH}.tar.gz \
+ && wget -qO- ${HWLOC_URL}/v${HWLOC_VER}/downloads/hwloc-${HWLOC_VER}.${HWLOC_VER_PATCH}.tar.gz \
+    |tar xfz - -C /usr/local/src/
+COPY ./extern-deps /usr/local/extern-deps
+RUN cd /usr/local/src/hwloc-${HWLOC_VER}.${HWLOC_VER_PATCH} \
+ && patch -p1 < /usr/local/extern-deps/hwloc-${HWLOC_VER}.${HWLOC_VER_PATCH}-0001-Add-native-svg-support.patch
+RUN cd /usr/local/src/hwloc-${HWLOC_VER}.${HWLOC_VER_PATCH} \
+ && ./configure --prefix=/usr/local/hwloc \
+ && make \
+ && make install
+
+FROM qnib/uplain-init:14.04 AS htopml
+COPY --from=hwloc /usr/local/hwloc/ /usr/
+RUN apt-get update \
+ && apt-get install -y cmake wget patch build-essential automake
+COPY . /usr/local/htopml/
+WORKDIR /usr/local/htopml/build/
+RUN ../configure --prefix=/usr/local/htopml --with-hwloc=/usr \
+ && make \
+ && make install
+
+FROM qnib/uplain-init:14.04
+ENV SKIP_ENTRYPOINTS=true
+COPY --from=hwloc /usr/local/hwloc/ /usr/
+COPY --from=htopml /usr/local/htopml/bin/ /usr/bin/
+COPY --from=htopml /usr/local/htopml/lib /usr/local/htopml/lib
+
+CMD ["htopmld"]

From f0b833ffaff6efc6d8e42168eaa897318bc2f74f Mon Sep 17 00:00:00 2001
From: Christian Kniep <christian@qnib.org>
Date: Tue, 8 Aug 2017 13:50:46 +0200
Subject: [PATCH 2/2] add symlinks to htopml

---
 Dockerfile | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index a88bf00..85f257b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -31,7 +31,11 @@ RUN ../configure --prefix=/usr/local/htopml --with-hwloc=/usr \
 FROM qnib/uplain-init:14.04
 ENV SKIP_ENTRYPOINTS=true
 COPY --from=hwloc /usr/local/hwloc/ /usr/
-COPY --from=htopml /usr/local/htopml/bin/ /usr/bin/
-COPY --from=htopml /usr/local/htopml/lib /usr/local/htopml/lib
-
+COPY --from=htopml /usr/local/htopml/ /usr/local/htopml/
+RUN ln -s /usr/local/htopml/bin/htopml \
+          /usr/local/htopml/bin/htopmld  \
+          /usr/local/htopml/bin/htopml-slurm-proxy \
+          /usr/local/htopml/bin/htopml-passwd \
+          /usr/local/htopml/bin/htopml-generate \
+          /usr/bin/
 CMD ["htopmld"]