From f140b7cbe14863e262dd136a46ebef6e4a552e48 Mon Sep 17 00:00:00 2001
From: Alexey Naiden <17383+anayden@users.noreply.github.com>
Date: Tue, 8 Jun 2021 17:45:04 +0300
Subject: [PATCH] Fix OOM guard location (#142)

* Fix oom_guard location

* Fix build

* Fix neuro-cli

* More test fix

* Damn it!
---
 .github/workflows/ci.yaml                           |  2 +-
 files/{root => usr/local/sbin}/oom_guard.sh         |  0
 .../Dockerfile                                      | 13 +++++++------
 3 files changed, 8 insertions(+), 7 deletions(-)
 rename files/{root => usr/local/sbin}/oom_guard.sh (100%)

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 239de12d..5629f58f 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -33,7 +33,7 @@ jobs:
         run: |
           python -m venv venv
           source venv/bin/activate
-          pip install -U neuro-cli
+          pip install -U neuro-cli packaging neuro-sdk
 
       - name: Configure environment
         run: |
diff --git a/files/root/oom_guard.sh b/files/usr/local/sbin/oom_guard.sh
similarity index 100%
rename from files/root/oom_guard.sh
rename to files/usr/local/sbin/oom_guard.sh
diff --git a/targets/python37-jupyter-pytorch-tensorflow-jupyterlab/Dockerfile b/targets/python37-jupyter-pytorch-tensorflow-jupyterlab/Dockerfile
index f031c58f..ee9a44bb 100644
--- a/targets/python37-jupyter-pytorch-tensorflow-jupyterlab/Dockerfile
+++ b/targets/python37-jupyter-pytorch-tensorflow-jupyterlab/Dockerfile
@@ -6,8 +6,8 @@
 # jupyterlab    latest    (pip)
 # pytorch       1.6.0     (docker-hub)
 # tensorflow    2.3.0     (pip)
-# neuro-cli     21.5.17    (pip)
-# neuro-flow    21.5.25   (pip)
+# neuro-cli     21.6.3    (pip)
+# neuro-flow    21.6.2   (pip)
 # neuro-extras  21.3.19  (pip)
 # ==================================================================
 
@@ -125,9 +125,10 @@ RUN APT_INSTALL="apt-get install -y --no-install-recommends" && \
 # ------------------------------------------------------------------
 
     $PIP_INSTALL \
-        neuro-cli==21.5.17 \
-        neuro-flow==21.5.25 \
+        neuro-cli==21.6.3 \
+        neuro-flow==21.6.2 \
         neuro-extras==21.3.19 \
+        packaging \
         && \
 
 # ==================================================================
@@ -197,8 +198,8 @@ RUN APT_INSTALL="apt-get install -y --no-install-recommends" && \
 # Adds a script to tune oom_killer behavior and puts it into the crontab
 # ==================================================================
 
-COPY files/root/oom_guard.sh /root/oom_guard.sh
-RUN crontab -l 2>/dev/null | { cat; echo '* * * * * /root/oom_guard.sh'; } | crontab
+COPY files/usr/local/sbin/oom_guard.sh /usr/local/sbin/oom_guard.sh
+RUN crontab -l 2>/dev/null | { cat; echo '* * * * * /usr/local/sbin/oom_guard.sh'; } | crontab
 
 # ==================================================================
 # Documentation notebook