From d26adb81cb23d20b7398a461c416679218aae2f8 Mon Sep 17 00:00:00 2001
From: Ayaz Salikhov <asalikhov@aimtech.team>
Date: Sat, 16 Oct 2021 17:05:37 +0300
Subject: [PATCH 1/3] Fix tensorflow keras bug

---
 .pre-commit-config.yaml        |  1 +
 tensorflow-notebook/Dockerfile | 10 ++++++++++
 2 files changed, 11 insertions(+)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index a5f2ed82..df896e60 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -28,6 +28,7 @@ repos:
     rev: v2.7.0
     hooks:
       - id: hadolint-docker
+        entry: hadolint/hadolint:v2.7.0 hadolint
 
   # Lint: YAML
   - repo: https://github.com/adrienverge/yamllint.git
diff --git a/tensorflow-notebook/Dockerfile b/tensorflow-notebook/Dockerfile
index db9db201..c14d8f40 100644
--- a/tensorflow-notebook/Dockerfile
+++ b/tensorflow-notebook/Dockerfile
@@ -6,6 +6,16 @@ FROM $BASE_CONTAINER
 
 LABEL maintainer="Jupyter Project <jupyter@googlegroups.com>"
 
+# Fix DL4006
+SHELL ["/bin/bash", "-o", "pipefail", "-c"]
+
+# Temporary fix for https://github.com/jupyter/docker-stacks/issues/1480
+USER root
+WORKDIR /opt/conda/lib/python3.9/site-packages/
+RUN wget -qO- https://patch-diff.githubusercontent.com/raw/tensorflow/tensorflow/pull/51450.diff | git apply
+USER ${NB_UID}
+WORKDIR "${HOME}"
+
 # Install Tensorflow
 RUN mamba install --quiet --yes \
     'tensorflow' && \

From e0bebfff749ea8c35126c2e0719a972327906e5d Mon Sep 17 00:00:00 2001
From: Ayaz Salikhov <asalikhov@aimtech.team>
Date: Sat, 16 Oct 2021 17:08:18 +0300
Subject: [PATCH 2/3] Fix hadolint bug

---
 r-notebook/Dockerfile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/r-notebook/Dockerfile b/r-notebook/Dockerfile
index 912a771b..b654bada 100644
--- a/r-notebook/Dockerfile
+++ b/r-notebook/Dockerfile
@@ -46,6 +46,7 @@ RUN mamba install --quiet --yes \
     fix-permissions "/home/${NB_USER}"
 
 # These packages are not easy to install under arm
+# hadolint ignore=SC2039
 RUN set -x && \
     arch=$(uname -m) && \
     if [ "${arch}" == "x86_64" ]; then \

From 8f06d5ccc04a56672b9ac1eddfc85842887f90b0 Mon Sep 17 00:00:00 2001
From: Ayaz Salikhov <asalikhov@aimtech.team>
Date: Sat, 16 Oct 2021 22:06:12 +0300
Subject: [PATCH 3/3] Fix tensorflow install

---
 tensorflow-notebook/Dockerfile | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/tensorflow-notebook/Dockerfile b/tensorflow-notebook/Dockerfile
index c14d8f40..fb735b90 100644
--- a/tensorflow-notebook/Dockerfile
+++ b/tensorflow-notebook/Dockerfile
@@ -9,16 +9,16 @@ LABEL maintainer="Jupyter Project <jupyter@googlegroups.com>"
 # Fix DL4006
 SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 
-# Temporary fix for https://github.com/jupyter/docker-stacks/issues/1480
-USER root
-WORKDIR /opt/conda/lib/python3.9/site-packages/
-RUN wget -qO- https://patch-diff.githubusercontent.com/raw/tensorflow/tensorflow/pull/51450.diff | git apply
-USER ${NB_UID}
-WORKDIR "${HOME}"
-
 # Install Tensorflow
 RUN mamba install --quiet --yes \
     'tensorflow' && \
     mamba clean --all -f -y && \
     fix-permissions "${CONDA_DIR}" && \
     fix-permissions "/home/${NB_USER}"
+
+# Temporary fix for https://github.com/jupyter/docker-stacks/issues/1480
+USER root
+WORKDIR /opt/conda/lib/python3.9/site-packages/
+RUN wget -qO- https://patch-diff.githubusercontent.com/raw/tensorflow/tensorflow/pull/51450.diff | git apply
+USER ${NB_UID}
+WORKDIR "${HOME}"