From 4e7888cb088e61491cf3e25a01526e485a6ddadd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Filip=20=C5=A0?= <filip.stamcar@hotmail.com>
Date: Mon, 13 Jul 2020 22:27:44 +0200
Subject: [PATCH 1/3] Add support for Python 3 in workspace

---
 env-example          |  1 +
 workspace/Dockerfile | 14 +++++++++++++-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/env-example b/env-example
index a389148d..70358536 100644
--- a/env-example
+++ b/env-example
@@ -139,6 +139,7 @@ WORKSPACE_INSTALL_LINUXBREW=false
 WORKSPACE_INSTALL_MC=false
 WORKSPACE_INSTALL_SYMFONY=false
 WORKSPACE_INSTALL_PYTHON=false
+WORKSPACE_INSTALL_PYTHON3=false
 WORKSPACE_INSTALL_POWERLINE=false
 WORKSPACE_INSTALL_SUPERVISOR=false
 WORKSPACE_INSTALL_IMAGE_OPTIMIZERS=false
diff --git a/workspace/Dockerfile b/workspace/Dockerfile
index f2694c4e..6a542ea5 100644
--- a/workspace/Dockerfile
+++ b/workspace/Dockerfile
@@ -1068,7 +1068,7 @@ RUN if [ ${INSTALL_SYMFONY} = true ]; then \
 ;fi
 
 ###########################################################################
-# PYTHON:
+# PYTHON2:
 ###########################################################################
 
 ARG INSTALL_PYTHON=false
@@ -1079,6 +1079,18 @@ RUN if [ ${INSTALL_PYTHON} = true ]; then \
   && python -m pip install --upgrade virtualenv \
 ;fi
 
+###########################################################################
+# PYTHON3:
+###########################################################################
+
+ARG INSTALL_PYTHON3=false
+
+RUN if [ ${INSTALL_PYTHON3} = true ]; then \
+  apt-get -y install python3 python3-pip python3-dev build-essential  \
+  && python3 -m pip install --upgrade pip  \
+  && python3 -m pip install --upgrade virtualenv \
+;fi
+
 ###########################################################################
 # POWERLINE:
 ###########################################################################

From caee5e0f9fab8735051e6d05d4e4665cd1db6857 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Filip=20=C5=A0?= <filip.stamcar@hotmail.com>
Date: Mon, 13 Jul 2020 23:09:07 +0200
Subject: [PATCH 2/3] Add missing WORKSPACE_INSTALL_PYTHON3 to
 docker-compose.yml

---
 docker-compose.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docker-compose.yml b/docker-compose.yml
index 9ca6adae..53bfa951 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -111,6 +111,7 @@ services:
           - INSTALL_MC=${WORKSPACE_INSTALL_MC}
           - INSTALL_SYMFONY=${WORKSPACE_INSTALL_SYMFONY}
           - INSTALL_PYTHON=${WORKSPACE_INSTALL_PYTHON}
+          - INSTALL_PYTHON3=${WORKSPACE_INSTALL_PYTHON3}
           - INSTALL_IMAGE_OPTIMIZERS=${WORKSPACE_INSTALL_IMAGE_OPTIMIZERS}
           - INSTALL_IMAGEMAGICK=${WORKSPACE_INSTALL_IMAGEMAGICK}
           - INSTALL_TERRAFORM=${WORKSPACE_INSTALL_TERRAFORM}

From 86f5a7d9e0be68eba212865edabf51ec8a0ab4ca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Filip=20=C5=A0?= <filip.stamcar@hotmail.com>
Date: Mon, 13 Jul 2020 23:17:45 +0200
Subject: [PATCH 3/3] Force reinstall pip to fix warning

---
 workspace/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/workspace/Dockerfile b/workspace/Dockerfile
index 6a542ea5..5f4c38a3 100644
--- a/workspace/Dockerfile
+++ b/workspace/Dockerfile
@@ -1087,7 +1087,7 @@ ARG INSTALL_PYTHON3=false
 
 RUN if [ ${INSTALL_PYTHON3} = true ]; then \
   apt-get -y install python3 python3-pip python3-dev build-essential  \
-  && python3 -m pip install --upgrade pip  \
+  && python3 -m pip install --upgrade --force-reinstall pip  \
   && python3 -m pip install --upgrade virtualenv \
 ;fi