From f5306a7a887df057f9d0b2e7a077fef1875decb5 Mon Sep 17 00:00:00 2001
From: Athanasios Tasoglou <tasoglou@gmail.com>
Date: Wed, 31 Jul 2019 21:00:49 +0200
Subject: [PATCH] Revert back to Python 3.4

---
 nvidia/indigo/base/Dockerfile                 | 17 +++++++------
 .../cuda10/cudnn7/opencv3/vscode/Dockerfile   | 24 -------------------
 2 files changed, 10 insertions(+), 31 deletions(-)
 delete mode 100644 nvidia/indigo/cuda10/cudnn7/opencv3/vscode/Dockerfile

diff --git a/nvidia/indigo/base/Dockerfile b/nvidia/indigo/base/Dockerfile
index c8caf18..b8b6102 100644
--- a/nvidia/indigo/base/Dockerfile
+++ b/nvidia/indigo/base/Dockerfile
@@ -19,6 +19,7 @@ wget \
 curl \
 htop \
 dbus-x11 \
+python3 python3-dev python3-pip \
 software-properties-common python-software-properties \
 gdb valgrind && \
 apt-get clean && rm -rf /var/lib/apt/lists/*
@@ -40,15 +41,17 @@ RUN /usr/bin/yes | pip install --upgrade pip
 RUN /usr/bin/yes | pip install --upgrade virtualenv
 RUN /usr/bin/yes | pip install --upgrade paramiko
 RUN /usr/bin/yes | pip install --ignore-installed --upgrade numpy protobuf
+RUN /usr/bin/yes | pip3 install --upgrade pip
+RUN /usr/bin/yes | pip3 install --upgrade numpy
 
 # Install Python 3.6 and pip3
-RUN add-apt-repository -y ppa:jonathonf/python-3.6 && apt-get update && apt-get install -y \
-python3 python3-dev python3.6 python3.6-dev && \
-apt-get clean && rm -rf /var/lib/apt/lists/* && \
-curl https://bootstrap.pypa.io/get-pip.py | python3.6 && \
-update-alternatives --install /usr/bin/python3 python3 /usr/bin/python3.4 1 && \
-update-alternatives --install /usr/bin/python3 python3 /usr/bin/python3.6 2
-RUN /usr/bin/yes | pip3 install --upgrade pip numpy
+# RUN add-apt-repository -y ppa:jonathonf/python-3.6 && apt-get update && apt-get install -y \
+# python3 python3-dev python3.6 python3.6-dev && \
+# apt-get clean && rm -rf /var/lib/apt/lists/* && \
+# curl https://bootstrap.pypa.io/get-pip.py | python3.6 && \
+# update-alternatives --install /usr/bin/python3 python3 /usr/bin/python3.4 1 && \
+# update-alternatives --install /usr/bin/python3 python3 /usr/bin/python3.6 2
+# RUN /usr/bin/yes | pip3 install --upgrade pip numpy
 
 # Locale
 RUN locale-gen en_US.UTF-8  
diff --git a/nvidia/indigo/cuda10/cudnn7/opencv3/vscode/Dockerfile b/nvidia/indigo/cuda10/cudnn7/opencv3/vscode/Dockerfile
deleted file mode 100644
index 6177b7f..0000000
--- a/nvidia/indigo/cuda10/cudnn7/opencv3/vscode/Dockerfile
+++ /dev/null
@@ -1,24 +0,0 @@
-FROM turlucode/ros-indigo:cuda10-cudnn7-opencv3
-
-MAINTAINER Athanasios Tasoglou <athanasios@tasoglou.net>
-LABEL Description="ROS-Indigo-Desktop with CUDA 10, cuDNN 7, OpenCV v3.4.7 and VS Code support (Ubuntu 14.04)" Vendor="TurluCode" Version="1.4"
-LABEL com.turlucode.ros.opencv="3.4.7"
-
-## Install dependencies
-RUN apt-get update && apt-get install -y \
-software-properties-common \
-apt-transport-https \
-wget && \
-apt-get clean && rm -rf /var/lib/apt/lists/*
-
-RUN wget -q https://packages.microsoft.com/keys/microsoft.asc -O- | sudo apt-key add -
-
-RUN sudo add-apt-repository "deb [arch=amd64] https://packages.microsoft.com/repos/vscode stable main"
-
-## Install VS Code
-RUN apt-get update && apt-get install -y \
-code && \
-apt-get clean && rm -rf /var/lib/apt/lists/*
-
-# Launch terminator
-CMD ["terminator"]