update docker setup

Author: TillBeemelmanns

docker/Dockerfile

@@ -1,6 +1,87 @@
-# Specify parent image. Please select a fixed tag here.
-ARG BASE_IMAGE=rwthika/acdc-notebooks:rwth-courses
-FROM ${BASE_IMAGE}
+FROM jupyter/minimal-notebook:lab-3.1.4
+
+USER root
+
+# Install all OS dependencies for fully functional notebook server
+RUN apt-get update --yes && \
+    apt-get install --yes --no-install-recommends \
+    vim-tiny \
+    git \
+    inkscape \
+    libsm6 \
+    libxext-dev \
+    libxrender1 \
+    lmodern \
+    netcat \
+    openssh-client \
+    # ---- nbconvert dependencies ----
+    texlive-xetex \
+    texlive-fonts-recommended \
+    texlive-plain-generic \
+    # ----
+    tzdata \
+    unzip \
+    nano-tiny && \
+    apt-get clean && rm -rf /var/lib/apt/lists/*
+
+# Create alternative for nano -> nano-tiny
+RUN update-alternatives --install /usr/bin/nano nano /bin/nano-tiny 10
+
+RUN apt-get update && \
+	apt install -y git
+
+USER ${NB_USER}
+
+RUN pip install \
+	'jupyterlab_iframe==0.4.0' \
+	'git+https://github.com/stv0g/nbgitpuller@f735265f7b2a429a17a8fab70cfd3557f060640d' \
+	'rwth-nb==0.1.8'
+
+RUN conda install --name base --no-update-deps \
+		'conda==4.10.3' && \
+	conda install --name base --quiet --yes --no-update-deps \
+		'jupyterlab-git==0.32.1' \
+		'ujson==4.0.2' \
+		'ipywidgets==7.6.3' \
+		'ipympl==0.7.0' \
+		'matplotlib-base==3.4.3' && \
+	conda clean --all
+
+
+RUN conda install --name base --quiet --yes --no-update-deps \
+		'jupyterlab_widgets' \
+		'jupyterlab-drawio==0.9.0' \
+		'jupyterlab_iframe==0.4.0' \
+		'jupyterlab_latex=3.0.0' && \
+	conda clean --all
+
+# Workaround LaTex
+RUN git clone https://github.com/joequant/jupyterlab-latex /tmp/jupyterlab-latex && cd /tmp/jupyterlab-latex && git checkout cbb66825786ecf11a35fd92df797f8ccee719ad4 && pip install -ve .
+RUN jupyter lab build
+
+
+USER root
+
+# Use RWTH Mirror
+#RUN sed -i 's|http://archive.ubuntu.com|http://ftp.halifax.rwth-aachen.de|g' /etc/apt/sources.list
+
+RUN apt-get update && \
+	apt-get -y install \
+		language-pack-de \
+		texlive-latex-recommended \
+		openssh-client && \
+	rm -rf /var/lib/apt/lists/*
+
+# Add more locales
+RUN locale-gen de_DE && \
+	locale-gen de_DE.UTF-8 && \
+	update-locale
+
+USER ${NB_USER}
+
+ENV JUPYTER_ENABLE_LAB=yes
+
+# Until HERE RWTH BASE IMAGE 
 
 # Install cv2
 USER root
@@ -19,7 +100,6 @@ RUN apt-get update && \
         python3-opencv \
     && rm -rf /var/lib/apt/lists/*
 
-RUN pip install opencv-python
 
 # Install ROS
 RUN echo "deb http://packages.ros.org/ros/ubuntu $(lsb_release -sc) main" > /etc/apt/sources.list.d/ros-latest.list
@@ -45,6 +125,7 @@ RUN apt-get update && \
                        ros-noetic-rosbridge-server \
                        ros-noetic-rosbridge-suite \
                        ros-noetic-tf2-web-republisher \
+                       ros-noetic-actionlib \
                        libboost-dev \
                        libeigen3-dev \
                        libgeographic-dev \
@@ -54,7 +135,6 @@ RUN apt-get update && \
                        python3-catkin-pkg \
                        python3-rospkg \
                        python3-empy \
-                       ros-noetic-actionlib \
                        python3-osrf-pycommon \
                        python3-wstool \
     && rm -rf /var/lib/apt/lists/*
@@ -69,6 +149,14 @@ RUN git clone https://github.com/fzi-forschungszentrum-informatik/Lanelet2 /lane
 
 USER jovyan
 
+ARG TARGETPLATFORM
+
+RUN if [ "$TARGETPLATFORM" = "linux/amd64" ]; then \
+    pip install tensorflow-gpu==2.10.0 ; \
+    elif [ "$TARGETPLATFORM" = "linux/arm64" ] ; then \
+    python -m pip install tensorflow-macos ; \
+    fi
+
 # Install packages via requirements.txt
 ADD requirements.txt .
 RUN pip install -r requirements.txt
@@ -101,6 +189,3 @@ RUN pip install jupyterlab-zethus
 RUN jupyter nbextension install --py --symlink --sys-prefix jupyros
 RUN jupyter nbextension enable --py --sys-prefix jupyros
 RUN jupyter nbextension enable --py --sys-prefix widgetsnbextension
-
-
-

docker/docker_build.sh

@@ -1,8 +1,9 @@
 #!/bin/sh
 #docker buildx create --use
+
 docker buildx build \
---push \
 --platform linux/amd64,linux/arm64 \
 --cache-from type=registry,ref=rwthika/acdc-notebooks:latest \
 --tag rwthika/acdc-notebooks:latest \
+--output type=docker \
 .

docker/requirements.txt

@@ -1,4 +1,3 @@
-tensorflow-gpu==2.10.0
 tensorflow-addons
 tensorflow-datasets
 matplotlib