Release bugfix version 2.2

Update docker-jupyter images

Author: BerndDoser

CMakeLists.txt

@@ -1,5 +1,5 @@
 cmake_minimum_required(VERSION 3.0)
-project(Pink VERSION 2.1 LANGUAGES C CXX)
+project(Pink VERSION 2.2 LANGUAGES C CXX)
 
 message(STATUS "${PROJECT_NAME} version ${PROJECT_VERSION}")
 

conanfile.py

@@ -3,7 +3,7 @@
 class RecordConan(ConanFile):
 
     name = "pink"
-    version = "2.1"
+    version = "2.2"
     license = "GPLv3"
     description = "Parallelized rotation and flipping INvariant Kohonen maps"
     homepage = "https://github.com/HITS-AIN/PINK"

tools/chmod_notebooks.sh

@@ -0,0 +1 @@
+chown -R $USER_NAME:$GROUP_NAME /notebooks

tools/dockerfile-cpu

@@ -1,4 +1,4 @@
-FROM ubuntu:18.04
+FROM braintwister/ubuntu-18.04-cmake-3.14-gcc-8-conan-1.16
 
 LABEL maintainer="Bernd Doser <bernd.doser@h-its.org>"
 
@@ -13,13 +13,6 @@ RUN echo $TZ > /etc/timezone && \
   apt-get clean
 
 RUN apt-get update && apt-get install -y --no-install-recommends \
-        build-essential \
-        cmake \
-        git \
-        python3 \
-        python3-dev \
-        python3-pip \
-        python3-setuptools \
         python3-tk \
         && \
     apt-get clean && \
@@ -28,34 +21,30 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
 RUN pip3 install --upgrade pip && \
     hash -r pip3 && \
     pip3 install -I \
-    conan \
     jupyter \
     matplotlib \
     numpy \
     tensorflow \
     tqdm
 
-RUN conan remote add braintwister https://api.bintray.com/conan/braintwister/conan && \
-    conan remote add conan-community https://api.bintray.com/conan/conan-community/conan && \
-    conan remote add bincrafters https://api.bintray.com/conan/bincrafters/public-conan
-
 RUN git clone https://github.com/HITS-AIN/PINK.git && \
     cd PINK && \
-    git checkout 2.1 && \
+    git checkout 2.2 && \
     mkdir build && cd build && \
     cmake .. && \
     make
 
-RUN cd PINK/build && \
-    make test
-
 ENV PYTHONPATH /PINK/build/lib
 ENV JUPYTER_PATH /PINK/build/lib
 
 COPY notebooks-cpu /notebooks
 
+# Add entrypoint
+ADD chmod_notebooks.sh /entrypoint.d/
+
 # Set up notebook config
-COPY jupyter_notebook_config.py /root/.jupyter/
+COPY jupyter_notebook_config.py /jupyter-config/
+ENV JUPYTER_CONFIG_DIR /jupyter-config
 
 WORKDIR /notebooks
 EXPOSE 8888

tools/dockerfile-cpu-devel

@@ -1,4 +1,4 @@
-FROM ubuntu:18.04
+FROM braintwister/ubuntu-18.04
 
 LABEL maintainer="Bernd Doser <bernd.doser@h-its.org>"
 
@@ -13,10 +13,6 @@ RUN echo $TZ > /etc/timezone && \
   apt-get clean
 
 RUN apt-get update && apt-get install -y --no-install-recommends \
-        python3 \
-        python3-dev \
-        python3-pip \
-        python3-setuptools \
         python3-tk \
         && \
     apt-get clean && \
@@ -31,11 +27,18 @@ RUN pip3 install --upgrade pip && \
     tensorflow \
     tqdm
 
-ENV PYTHONPATH /PINK/build/lib
-ENV JUPYTER_PATH /PINK/build/lib
+ENV PYTHONPATH /PINK/build/default/lib
+ENV JUPYTER_PATH /PINK/build/default/lib
+
+# Set up notebook config
+COPY jupyter_notebook_config.py /jupyter-config/
+ENV JUPYTER_CONFIG_DIR /jupyter-config
 
 COPY notebooks-cpu /notebooks
 
+# Add entrypoint
+ADD chmod_notebooks.sh /entrypoint.d/
+
 WORKDIR /notebooks
 EXPOSE 8888
 

tools/dockerfile-gpu

@@ -13,13 +13,6 @@ RUN echo $TZ > /etc/timezone && \
   apt-get clean
 
 RUN apt-get update && apt-get install -y --no-install-recommends \
-        build-essential \
-        cmake \
-        git \
-        python3 \
-        python3-dev \
-        python3-pip \
-        python3-setuptools \
         python3-tk \
         && \
     apt-get clean && \
@@ -28,34 +21,30 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
 RUN pip3 install --upgrade pip && \
     hash -r pip3 && \
     pip3 install -I \
-    conan \
     jupyter \
     matplotlib \
     numpy \
     tensorflow \
     tqdm
 
-RUN conan remote add braintwister https://api.bintray.com/conan/braintwister/conan && \
-    conan remote add conan-community https://api.bintray.com/conan/conan-community/conan && \
-    conan remote add bincrafters https://api.bintray.com/conan/bincrafters/public-conan
-
 RUN git clone https://github.com/HITS-AIN/PINK.git && \
     cd PINK && \
-    git checkout 2.1 && \
+    git checkout 2.2 && \
     mkdir build && cd build && \
     cmake .. && \
     make
 
-#RUN cd PINK/build && \
-#    make test
-
 ENV PYTHONPATH /PINK/build/lib
 ENV JUPYTER_PATH /PINK/build/lib
 
 COPY notebooks-gpu /notebooks
 
+# Add entrypoint
+ADD chmod_notebooks.sh /entrypoint.d/
+
 # Set up notebook config
-COPY jupyter_notebook_config.py /root/.jupyter/
+COPY jupyter_notebook_config.py /jupyter-config/
+ENV JUPYTER_CONFIG_DIR /jupyter-config
 
 WORKDIR /notebooks
 EXPOSE 8888

tools/dockerfile-gpu-devel

@@ -13,10 +13,6 @@ RUN echo $TZ > /etc/timezone && \
   apt-get clean
 
 RUN apt-get update && apt-get install -y --no-install-recommends \
-        python3 \
-        python3-dev \
-        python3-pip \
-        python3-setuptools \
         python3-tk \
         && \
     apt-get clean && \
@@ -31,11 +27,19 @@ RUN pip3 install --upgrade pip && \
     tensorflow \
     tqdm
 
-ENV PYTHONPATH /PINK/build/lib
-ENV JUPYTER_PATH /PINK/build/lib
+ENV PYTHONPATH /PINK/build/default/lib
+ENV JUPYTER_PATH /PINK/build/default/lib
+ENV LD_LIBRARY_PATH /PINK/build/default/lib
+
+# Set up notebook config
+COPY jupyter_notebook_config.py /jupyter-config/
+ENV JUPYTER_CONFIG_DIR /jupyter-config
 
 COPY notebooks-gpu /notebooks
 
+# Add entrypoint
+ADD chmod_notebooks.sh /entrypoint.d/
+
 WORKDIR /notebooks
 EXPOSE 8888