From cb2341a750f187e31952c5d0cedda15029f585ae Mon Sep 17 00:00:00 2001
From: Julio Perez <jperez@nvidia.com>
Date: Mon, 2 May 2022 16:24:09 -0400
Subject: [PATCH 1/8] add entrypoint to all containers

---
 docker/inference/dockerfile.ctr   | 1 +
 docker/inference/dockerfile.tf    | 1 +
 docker/inference/dockerfile.torch | 1 +
 docker/training/dockerfile.ctr    | 1 +
 docker/training/dockerfile.tf     | 1 +
 docker/training/dockerfile.torch  | 1 +
 6 files changed, 6 insertions(+)

diff --git a/docker/inference/dockerfile.ctr b/docker/inference/dockerfile.ctr
index 17a109d0e..b049c7bf1 100644
--- a/docker/inference/dockerfile.ctr
+++ b/docker/inference/dockerfile.ctr
@@ -381,3 +381,4 @@ RUN rm -rf /repos
 
 HEALTHCHECK NONE
 CMD ["/bin/bash"]
+ENTRYPOINT ["/bin/bash", "-c", "/opt/nvidia/nvidia_entrypoint.sh"]
diff --git a/docker/inference/dockerfile.tf b/docker/inference/dockerfile.tf
index 1e55df0d1..d4c96b7c9 100644
--- a/docker/inference/dockerfile.tf
+++ b/docker/inference/dockerfile.tf
@@ -205,3 +205,4 @@ RUN rm -rf /repos
 
 HEALTHCHECK NONE
 CMD ["/bin/bash"]
+ENTRYPOINT ["/bin/bash", "-c", "/opt/nvidia/nvidia_entrypoint.sh"]
diff --git a/docker/inference/dockerfile.torch b/docker/inference/dockerfile.torch
index ca0bbb54b..544e39a5f 100644
--- a/docker/inference/dockerfile.torch
+++ b/docker/inference/dockerfile.torch
@@ -199,3 +199,4 @@ RUN rm -rf /repos
 
 HEALTHCHECK NONE
 CMD ["/bin/bash"]
+ENTRYPOINT ["/bin/bash", "-c", "/opt/nvidia/nvidia_entrypoint.sh"]
diff --git a/docker/training/dockerfile.ctr b/docker/training/dockerfile.ctr
index 9f9ec804b..e9234f918 100644
--- a/docker/training/dockerfile.ctr
+++ b/docker/training/dockerfile.ctr
@@ -273,3 +273,4 @@ RUN rm -rf /usr/local/share/jupyter/lab/staging/node_modules/node-fetch
 
 HEALTHCHECK NONE
 CMD ["/bin/bash"]
+ENTRYPOINT ["/bin/bash", "-c", "/opt/nvidia/nvidia_entrypoint.sh"]
diff --git a/docker/training/dockerfile.tf b/docker/training/dockerfile.tf
index 724920708..cc8dc1580 100644
--- a/docker/training/dockerfile.tf
+++ b/docker/training/dockerfile.tf
@@ -123,3 +123,4 @@ RUN rm -rf /usr/local/share/jupyter/lab/staging/node_modules/node-fetch
 
 HEALTHCHECK NONE
 CMD ["/bin/bash"]
+ENTRYPOINT ["/bin/bash", "-c", "/opt/nvidia/nvidia_entrypoint.sh"]
diff --git a/docker/training/dockerfile.torch b/docker/training/dockerfile.torch
index c7c80c7b8..e8f2ab2db 100644
--- a/docker/training/dockerfile.torch
+++ b/docker/training/dockerfile.torch
@@ -86,3 +86,4 @@ RUN rm -rf /opt/conda/share/jupyter/lab/staging/node_modules/node-fetch
 
 HEALTHCHECK NONE
 CMD ["/bin/bash"]
+ENTRYPOINT ["/bin/bash", "-c", "/opt/nvidia/nvidia_entrypoint.sh"]

From fa45e642ef7d9ce1fc47cb5e2cee67df8d6c85f1 Mon Sep 17 00:00:00 2001
From: Julio Perez <jperez@nvidia.com>
Date: Wed, 4 May 2022 20:22:40 -0400
Subject: [PATCH 2/8] remove -e for pip installs

---
 docker/inference/dockerfile.ctr   |  8 ++++----
 docker/inference/dockerfile.tf    | 10 +++++-----
 docker/inference/dockerfile.torch |  8 ++++----
 docker/training/dockerfile.ctr    |  6 +++---
 docker/training/dockerfile.tf     |  2 +-
 docker/training/dockerfile.torch  |  8 ++++----
 6 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/docker/inference/dockerfile.ctr b/docker/inference/dockerfile.ctr
index 19bc00a87..59a731d30 100644
--- a/docker/inference/dockerfile.ctr
+++ b/docker/inference/dockerfile.ctr
@@ -192,7 +192,7 @@ RUN git clone https://github.com/rapidsai/cudf.git build-env && cd build-env/ &&
 
 # Install Merlin Core
 RUN git clone https://github.com/NVIDIA-Merlin/core.git /core/ && \
-    cd /core/ && git checkout ${CORE_VER} && pip install -e . --no-deps
+    cd /core/ && git checkout ${CORE_VER} && pip install . --no-deps
 ENV PYTHONPATH=$PYTHONPATH:/core
 
 # Install Merlin Systems
@@ -203,17 +203,17 @@ ENV PYTHONPATH=$PYTHONPATH:/systems
 # Install NVTabular
 ENV PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION='python'
 RUN git clone https://github.com/NVIDIA-Merlin/NVTabular.git /nvtabular/ && \
-    cd /nvtabular/ && git checkout ${NVTAB_VER} && pip install -e . --no-deps
+    cd /nvtabular/ && git checkout ${NVTAB_VER} && pip install . --no-deps
 ENV PYTHONPATH=$PYTHONPATH:/nvtabular
 
 # Install Transformers4Rec
 RUN git clone https://github.com/NVIDIA-Merlin/Transformers4Rec.git /transformers4rec && \
-    cd /transformers4rec/ && git checkout ${TF4REC_VER} && pip install -e . --no-deps
+    cd /transformers4rec/ && git checkout ${TF4REC_VER} && pip install . --no-deps
 ENV PYTHONPATH=$PYTHONPATH:/transformers4rec
 
 # Install Models
 RUN git clone https://github.com/NVIDIA-Merlin/Models.git /models/ && \
-    cd /models/ && git checkout ${MODELS_VER} && pip install -e . --no-deps;
+    cd /models/ && git checkout ${MODELS_VER} && pip install . --no-deps;
 ENV PYTHONPATH=$PYTHONPATH:/models
 
 # Add Merlin Repo
diff --git a/docker/inference/dockerfile.tf b/docker/inference/dockerfile.tf
index d4c96b7c9..e642ada57 100644
--- a/docker/inference/dockerfile.tf
+++ b/docker/inference/dockerfile.tf
@@ -85,7 +85,7 @@ RUN git clone --branch v1.9.2 https://github.com/gabime/spdlog.git build-env &&
 
 # Install arrow
 ENV ARROW_HOME=/usr/local
-RUN git clone --branch apache-arrow-5.0.0 --recurse-submodules https://github.com/apache/arrow.git build-env && \
+RUN git clone --branch apache-arrow-6.0.1 --recurse-submodules https://github.com/apache/arrow.git build-env && \
     pushd build-env && \
       export PARQUET_TEST_DATA="${PWD}/cpp/submodules/parquet-testing/data" && \
       export ARROW_TEST_DATA="${PWD}/testing/data" && \
@@ -156,7 +156,7 @@ RUN git clone https://github.com/rapidsai/cudf.git build-env && cd build-env/ &&
 
 # Install Merlin Core
 RUN git clone https://github.com/NVIDIA-Merlin/core.git /core/ && \
-    cd /core/ && git checkout ${CORE_VER} && pip install -e . --no-deps
+    cd /core/ && git checkout ${CORE_VER} && pip install . --no-deps
 ENV PYTHONPATH=$PYTHONPATH:/core
 
 # Install Merlin Systems
@@ -167,17 +167,17 @@ ENV PYTHONPATH=$PYTHONPATH:/systems
 # Install NVTabular
 ENV PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION='python'
 RUN git clone https://github.com/NVIDIA-Merlin/NVTabular.git /nvtabular/ && \
-    cd /nvtabular/ && git checkout ${NVTAB_VER} && pip install -e . --no-deps
+    cd /nvtabular/ && git checkout ${NVTAB_VER} && pip install . --no-deps
 ENV PYTHONPATH=$PYTHONPATH:/nvtabular
 
 # Install Transformers4Rec
 RUN git clone https://github.com/NVIDIA-Merlin/Transformers4Rec.git /transformers4rec && \
-    cd /transformers4rec/ && git checkout ${TF4REC_VER} && pip install -e . --no-deps
+    cd /transformers4rec/ && git checkout ${TF4REC_VER} && pip install . --no-deps
 ENV PYTHONPATH=$PYTHONPATH:/transformers4rec
 
 # Install Models
 RUN git clone https://github.com/NVIDIA-Merlin/Models.git /models/ && \
-    cd /models/ && git checkout ${MODELS_VER} && pip install -e . --no-deps;
+    cd /models/ && git checkout ${MODELS_VER} && pip install . --no-deps;
 ENV PYTHONPATH=$PYTHONPATH:/models
 
 # Add Merlin Repo
diff --git a/docker/inference/dockerfile.torch b/docker/inference/dockerfile.torch
index 544e39a5f..241b60008 100644
--- a/docker/inference/dockerfile.torch
+++ b/docker/inference/dockerfile.torch
@@ -150,7 +150,7 @@ RUN git clone https://github.com/rapidsai/cudf.git build-env && cd build-env/ &&
 
 # Install Merlin Core
 RUN git clone https://github.com/NVIDIA-Merlin/core.git /core/ && \
-    cd /core/ && git checkout ${CORE_VER} && pip install -e . --no-deps
+    cd /core/ && git checkout ${CORE_VER} && pip install . --no-deps
 ENV PYTHONPATH=$PYTHONPATH:/core
 
 # Install Merlin Systems
@@ -161,17 +161,17 @@ ENV PYTHONPATH=$PYTHONPATH:/systems
 # Install NVTabular
 ENV PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION='python'
 RUN git clone https://github.com/NVIDIA-Merlin/NVTabular.git /nvtabular/ && \
-    cd /nvtabular/ && git checkout ${NVTAB_VER} && pip install -e . --no-deps
+    cd /nvtabular/ && git checkout ${NVTAB_VER} && pip install . --no-deps
 ENV PYTHONPATH=$PYTHONPATH:/nvtabular
 
 # Install Transformers4Rec
 RUN git clone https://github.com/NVIDIA-Merlin/Transformers4Rec.git /transformers4rec && \
-    cd /transformers4rec/ && git checkout ${TF4REC_VER} && pip install -e . --no-deps
+    cd /transformers4rec/ && git checkout ${TF4REC_VER} && pip install . --no-deps
 ENV PYTHONPATH=$PYTHONPATH:/transformers4rec
 
 # Install Models
 RUN git clone https://github.com/NVIDIA-Merlin/Models.git /models/ && \
-    cd /models/ && git checkout ${MODELS_VER} && pip install -e . --no-deps;
+    cd /models/ && git checkout ${MODELS_VER} && pip install . --no-deps;
 ENV PYTHONPATH=$PYTHONPATH:/models
 
 # Add Merlin Repo
diff --git a/docker/training/dockerfile.ctr b/docker/training/dockerfile.ctr
index 4bda7a84e..d3372b53e 100644
--- a/docker/training/dockerfile.ctr
+++ b/docker/training/dockerfile.ctr
@@ -95,17 +95,17 @@ ENV PYTHONPATH=$PYTHONPATH:/systems
 # Install NVTabular
 ENV PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION='python'
 RUN git clone https://github.com/NVIDIA-Merlin/NVTabular.git /nvtabular/ && \
-    cd /nvtabular/ && git checkout ${NVTAB_VER} && pip install -e . --no-deps
+    cd /nvtabular/ && git checkout ${NVTAB_VER} && pip install . --no-deps
 ENV PYTHONPATH=$PYTHONPATH:/nvtabular
 
 # Install Transformers4Rec
 RUN git clone https://github.com/NVIDIA-Merlin/Transformers4Rec.git /transformers4rec && \
-    cd /transformers4rec/ && git checkout ${TF4REC_VER} && pip install -e . --no-deps
+    cd /transformers4rec/ && git checkout ${TF4REC_VER} && pip install . --no-deps
 ENV PYTHONPATH=$PYTHONPATH:/transformers4rec
 
 # Install Models
 RUN git clone https://github.com/NVIDIA-Merlin/Models.git /models/ && \
-    cd /models/ && git checkout ${MODELS_VER} && pip install -e . --no-deps
+    cd /models/ && git checkout ${MODELS_VER} && pip install . --no-deps
 ENV PYTHONPATH=$PYTHONPATH:/models
 
 # Add Merlin Repo
diff --git a/docker/training/dockerfile.tf b/docker/training/dockerfile.tf
index cc8dc1580..61cfe4ee2 100644
--- a/docker/training/dockerfile.tf
+++ b/docker/training/dockerfile.tf
@@ -80,7 +80,7 @@ ENV PYTHONPATH=$PYTHONPATH:/transformers4rec
 
 # Install Models
 RUN git clone https://github.com/NVIDIA-Merlin/Models.git /models/ && \
-    cd /models/ && git checkout ${MODELS_VER} && pip install -e . --no-deps
+    cd /models/ && git checkout ${MODELS_VER} && pip install . --no-deps
 ENV PYTHONPATH=$PYTHONPATH:/models
 
 # Add Merlin Repo
diff --git a/docker/training/dockerfile.torch b/docker/training/dockerfile.torch
index e8f2ab2db..ecfa1b913 100644
--- a/docker/training/dockerfile.torch
+++ b/docker/training/dockerfile.torch
@@ -52,7 +52,7 @@ RUN pip install git+https://github.com/rapidsai/asvdb.git@main
 
 # Install Merlin Core
 RUN git clone https://github.com/NVIDIA-Merlin/core.git /core/ && \
-    cd /core/ && git checkout ${CORE_VER} && pip install -e . --no-deps
+    cd /core/ && git checkout ${CORE_VER} && pip install . --no-deps
 ENV PYTHONPATH=$PYTHONPATH:/core
 
 # Install Merlin Systems
@@ -63,17 +63,17 @@ ENV PYTHONPATH=$PYTHONPATH:/systems
 # Install NVTabular
 ENV PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION='python'
 RUN git clone https://github.com/NVIDIA-Merlin/NVTabular.git /nvtabular/ && \
-    cd /nvtabular/ && git checkout ${NVTAB_VER} && pip install -e . --no-deps
+    cd /nvtabular/ && git checkout ${NVTAB_VER} && pip install . --no-deps
 ENV PYTHONPATH=$PYTHONPATH:/nvtabular
 
 # Install Transformers4Rec
 RUN git clone https://github.com/NVIDIA-Merlin/Transformers4Rec.git /transformers4rec && \
-    cd /transformers4rec/ && git checkout ${TF4REC_VER} && pip install -e . --no-deps
+    cd /transformers4rec/ && git checkout ${TF4REC_VER} && pip install . --no-deps
 ENV PYTHONPATH=$PYTHONPATH:/transformers4rec
 
 # Install Models
 RUN git clone https://github.com/NVIDIA-Merlin/Models.git /models/ && \
-    cd /models/ && git checkout ${MODELS_VER} && pip install -e . --no-deps
+    cd /models/ && git checkout ${MODELS_VER} && pip install . --no-deps
 ENV PYTHONPATH=$PYTHONPATH:/models
 
 # Add Merlin Repo

From 0b30e36dff54652a29ff907b2bd4db0d9cdf44a5 Mon Sep 17 00:00:00 2001
From: Julio Perez <jperez@nvidia.com>
Date: Fri, 13 May 2022 01:59:05 -0400
Subject: [PATCH 3/8] add keyring to fix bad key nvidia issue

---
 docker/dockerfile.merlin | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/docker/dockerfile.merlin b/docker/dockerfile.merlin
index ef6659469..f197285ae 100644
--- a/docker/dockerfile.merlin
+++ b/docker/dockerfile.merlin
@@ -28,6 +28,15 @@ ENV LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/cuda/lib64:/usr/local/cuda/extra
 ENV PATH=${CUDA_HOME}/lib64/:${PATH}:${CUDA_HOME}/bin
 ENV PYTHONPATH=/usr/lib/python3.8/site-packages:$PYTHONPATH
 
+
+RUN [ $(uname -m) = 'x86_64' ] \
+    && curl -o /tmp/cuda-keyring.deb \
+        https://developer.download.nvidia.com/compute/cuda/repos/ubuntu2004/x86_64/cuda-keyring_1.0-1_all.deb \
+    || curl -o /tmp/cuda-keyring.deb \
+        https://developer.download.nvidia.com/compute/cuda/repos/ubuntu2004/sbsa/cuda-keyring_1.0-1_all.deb; \
+    dpkg -i /tmp/cuda-keyring.deb \
+    && rm /tmp/cuda-keyring.deb
+
 # Set up NVIDIA package repository
 RUN apt update -y --fix-missing && \
     apt install -y --no-install-recommends software-properties-common && \

From 57bbeeaaab6333aaf4fc3a62d4635b98a85444fe Mon Sep 17 00:00:00 2001
From: Julio Perez <jperez@nvidia.com>
Date: Wed, 18 May 2022 12:53:06 -0400
Subject: [PATCH 4/8] trying to move env call to see if it helps fix the
 install of distributed embeddings after sok install

---
 docker/training/dockerfile.tf | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/docker/training/dockerfile.tf b/docker/training/dockerfile.tf
index 5f6a4614f..053f83257 100644
--- a/docker/training/dockerfile.tf
+++ b/docker/training/dockerfile.tf
@@ -104,7 +104,6 @@ RUN if [ "$HUGECTR_DEV_MODE" == "false" ]; then \
         popd && \
         rm -rf build-env; \
     fi
-ENV PYTHONPATH=$PYTHONPATH:/usr/lib/python3.8/site-packages/merlin_sok-1.1.3-py3.8-linux-x86_64.egg
 
 # Install distributed-embeddings
 ARG INSTALL_DISTRIBUTED_EMBEDDINGS=true
@@ -114,6 +113,9 @@ RUN if [ "$INSTALL_DISTRIBUTED_EMBEDDINGS" == "true" ]; then \
         make pip_pkg && pip install artifacts/*.whl && make clean; \
     fi
 
+ENV PYTHONPATH=$PYTHONPATH:/usr/lib/python3.8/site-packages/merlin_sok-1.1.3-py3.8-linux-x86_64.egg
+
+
 # Clean up
 RUN rm -rf /repos
 RUN rm -rf /usr/local/share/jupyter/lab/staging/node_modules/marked

From 930361dac226ce387d85060af805123244ba3e95 Mon Sep 17 00:00:00 2001
From: Julio Perez <jperez@nvidia.com>
Date: Fri, 20 May 2022 20:13:08 -0400
Subject: [PATCH 5/8] fix extra CVE

---
 docker/training/dockerfile.tf | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/docker/training/dockerfile.tf b/docker/training/dockerfile.tf
index 053f83257..fb9940769 100644
--- a/docker/training/dockerfile.tf
+++ b/docker/training/dockerfile.tf
@@ -1,5 +1,5 @@
 # syntax=docker/dockerfile:1
-ARG IMAGE=nvcr.io/nvidia/tensorflow:22.03-tf2-py3
+ARG IMAGE=nvcr.io/nvidia/tensorflow:22.04-tf2-py3
 FROM ${IMAGE}
 
 # Args
@@ -120,6 +120,7 @@ ENV PYTHONPATH=$PYTHONPATH:/usr/lib/python3.8/site-packages/merlin_sok-1.1.3-py3
 RUN rm -rf /repos
 RUN rm -rf /usr/local/share/jupyter/lab/staging/node_modules/marked
 RUN rm -rf /usr/local/share/jupyter/lab/staging/node_modules/node-fetch
+RUN rm /usr/local/nvm/versions/node/v16.6.1/lib/node_modules/npm/node_modules/cli-table3/node_modules/ansi-regex/package.json
 
 HEALTHCHECK NONE
 CMD ["/bin/bash"]

From 9a327257a5f0ae5b585b231e813af97d5de6f6ea Mon Sep 17 00:00:00 2001
From: Julio Perez <jperez@nvidia.com>
Date: Mon, 23 May 2022 23:52:21 -0400
Subject: [PATCH 6/8] fixing CI routes

---
 ci/test_container.sh | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/ci/test_container.sh b/ci/test_container.sh
index 7267f2958..faf468e4f 100755
--- a/ci/test_container.sh
+++ b/ci/test_container.sh
@@ -39,24 +39,24 @@ echo "##############"
 
 ## Test Core
 echo "Run unit tests for Core"
-/core/ci/test_unit.sh $container $devices
+cd /core && /ci/test_unit.sh $container $devices
 
 ## Test NVTabular
 echo "Run unit tests for NVTabular"
-/nvtabular/ci/test_unit.sh $container $devices
+cd /nvtabular && ci/test_unit.sh $container $devices
 
 ## Test Transformers4Rec
 echo "Run unit tests for Transformers4Rec"
-/transformers4rec/ci/test_unit.sh $container $devices
+cd /transformers4rec/ && ci/test_unit.sh $container $devices
 
 ## Test Models
 echo "Run unit tests for Models"
 pip install coverage
-/models/ci/test_unit.sh $container $devices
+cd /models/ && ci/test_unit.sh $container $devices
 
 ## Test Systems
 echo "Run unit tests for Systems"
-pytest -rxs /systems/tests/unit
+cd /systems && pytest -rxs /tests/unit
 
 ## Test HugeCTR
 if [ "$container" == "merlin-training" ]; then

From 9357a5dbf6fb9b460e96f0eef0ae1f4de0bf3b20 Mon Sep 17 00:00:00 2001
From: Julio Perez <jperez@nvidia.com>
Date: Wed, 1 Jun 2022 16:21:03 -0400
Subject: [PATCH 7/8] fix merlin merge

---
 .gitignore                      | 7 +++++++
 docker/dockerfile.tf            | 2 +-
 docker/inference/dockerfile.ctr | 4 ++--
 docker/training/dockerfile.ctr  | 2 +-
 4 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index 89caecbee..ecaa44c09 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,10 @@ docs/source/generated/
 
 __pycache__/
 *.py[cod]
+*.parquet
+*.pbtxt
+*.pb
+*.index
+*.faiss
+*.data*
+*.db
\ No newline at end of file
diff --git a/docker/dockerfile.tf b/docker/dockerfile.tf
index f59aaea91..0e61ef0d3 100644
--- a/docker/dockerfile.tf
+++ b/docker/dockerfile.tf
@@ -15,7 +15,7 @@ FROM ${BASE_IMAGE} as base
 COPY --chown=1000:1000 --from=triton /opt/tritonserver/backends/tensorflow2 backends/tensorflow2/
 
 # Tensorflow dependencies (only)
-RUN pip install tensorflow-gpu  \
+RUN pip install tensorflow-gpu scikit-build\
     && pip uninstall tensorflow-gpu keras -y
 
 # DLFW Tensorflow packages
diff --git a/docker/inference/dockerfile.ctr b/docker/inference/dockerfile.ctr
index baa86082d..2530c30b3 100644
--- a/docker/inference/dockerfile.ctr
+++ b/docker/inference/dockerfile.ctr
@@ -1,7 +1,7 @@
 # syntax=docker/dockerfile:1.2
-ARG TRITON_VERSION=22.03
+ARG TRITON_VERSION=22.0
 ARG FULL_IMAGE=nvcr.io/nvidia/tritonserver:${TRITON_VERSION}-py3
-ARG BASE_IMAGE=${FULL_IMAGE}-min
+ARG BASE_IMAGE=nvcr.io/nvidia/tritonserver:${TRITON_VERSION}-
 FROM ${FULL_IMAGE} as full
 FROM ${BASE_IMAGE} as base
 
diff --git a/docker/training/dockerfile.ctr b/docker/training/dockerfile.ctr
index 36f4efdcb..be676ba13 100644
--- a/docker/training/dockerfile.ctr
+++ b/docker/training/dockerfile.ctr
@@ -1,5 +1,5 @@
 # syntax=docker/dockerfile:1
-ARG IMAGE=nvcr.io/nvidia/tensorflow:22.03-tf2-py3
+ARG IMAGE=nvcr.io/nvidia/tensorflow:22.05-tf2-py3
 FROM ${IMAGE}
 
 # Args

From bde397ef2743e5490b42328a0f339dc18e144eb1 Mon Sep 17 00:00:00 2001
From: Julio Perez <jperez@nvidia.com>
Date: Mon, 13 Jun 2022 20:44:37 -0400
Subject: [PATCH 8/8] remove extra CMD that replaces previous entrypoint

---
 docker/dockerfile.ctr   | 3 ---
 docker/dockerfile.tf    | 4 ----
 docker/dockerfile.torch | 3 ---
 3 files changed, 10 deletions(-)

diff --git a/docker/dockerfile.ctr b/docker/dockerfile.ctr
index f69e1e8c9..f41013c90 100644
--- a/docker/dockerfile.ctr
+++ b/docker/dockerfile.ctr
@@ -277,6 +277,3 @@ RUN rm /usr/local/cuda/lib64/stubs/libcuda.so.1
 RUN rm -rf /repos
 RUN rm -rf /usr/local/share/jupyter/lab/staging/node_modules/marked
 RUN rm -rf /usr/local/share/jupyter/lab/staging/node_modules/node-fetch
-
-HEALTHCHECK NONE
-CMD ["/bin/bash"]
diff --git a/docker/dockerfile.tf b/docker/dockerfile.tf
index a516f0b40..53ff3e4c2 100644
--- a/docker/dockerfile.tf
+++ b/docker/dockerfile.tf
@@ -62,7 +62,3 @@ RUN if [ "$INSTALL_DISTRIBUTED_EMBEDDINGS" == "true" ]; then \
         cd /distributed_embeddings && git checkout ${TFDE_VER} && \
         make pip_pkg && pip install artifacts/*.whl && make clean; \
     fi
-
-
-HEALTHCHECK NONE
-CMD ["/bin/bash"]
\ No newline at end of file
diff --git a/docker/dockerfile.torch b/docker/dockerfile.torch
index de622ba57..059049da4 100644
--- a/docker/dockerfile.torch
+++ b/docker/dockerfile.torch
@@ -35,6 +35,3 @@ COPY --chown=1000:1000 --from=dlfw /opt/conda/lib/python3.8/site-packages/torch
 
 RUN pip install --no-deps fastai fastcore fastprogress fastdownload
 RUN pip install matplotlib
-
-HEALTHCHECK NONE
-CMD ["/bin/bash"]
\ No newline at end of file