From 6d89424e91a41693aaa7e2d87926c1681fe01944 Mon Sep 17 00:00:00 2001 From: James Whiteman Date: Mon, 7 Aug 2017 08:42:55 +1200 Subject: [PATCH 1/3] Update Dockerfile-70 Add python option to workspace --- workspace/Dockerfile-70 | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/workspace/Dockerfile-70 b/workspace/Dockerfile-70 index c55e297..d368563 100644 --- a/workspace/Dockerfile-70 +++ b/workspace/Dockerfile-70 @@ -545,6 +545,19 @@ RUN if [ ${INSTALL_IMAGE_OPTIMIZERS} = true ]; then \ ;fi\ ;fi +##################################### +# PYTHON: +##################################### + +ARG INSTALL_PYTHON=false +ENV INSTALL_PYTHON ${INSTALL_PYTHON} +RUN if [ ${INSTALL_PYTHON} = true ]; then \ + apt-get update \ + && apt-get -y install python python-pip python-dev build-essential \ + && pip install --upgrade pip \ + && pip install --upgrade virtualenv \ +;fi + # #-------------------------------------------------------------------------- # Final Touch From 3801973b15dd1f125aafeaf6a4698b8f21447845 Mon Sep 17 00:00:00 2001 From: James Whiteman Date: Mon, 7 Aug 2017 08:45:25 +1200 Subject: [PATCH 2/3] Update env-example Added missing symfony install variable and added new python install variable --- env-example | 2 ++ 1 file changed, 2 insertions(+) diff --git a/env-example b/env-example index a749ca4..be8b520 100644 --- a/env-example +++ b/env-example @@ -45,6 +45,8 @@ WORKSPACE_INSTALL_LARAVEL_INSTALLER=false WORKSPACE_INSTALL_DEPLOYER=false WORKSPACE_INSTALL_LINUXBREW=false WORKSPACE_INSTALL_MC=false +WORKSPACE_INSTALL_SYMFONY=false +WORKSPACE_INSTALL_PYTHON=false WORKSPACE_INSTALL_IMAGE_OPTIMIZERS=false WORKSPACE_PUID=1000 WORKSPACE_PGID=1000 From 05c7f9186aca312aeab3b7d67152ef0ab6024a95 Mon Sep 17 00:00:00 2001 From: James Whiteman Date: Mon, 7 Aug 2017 08:47:53 +1200 Subject: [PATCH 3/3] Update docker-compose.yml Added missing symfony and python options to workspace --- docker-compose.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docker-compose.yml b/docker-compose.yml index b0c9cb4..16a1aea 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -32,6 +32,8 @@ services: - INSTALL_DEPLOYER=${WORKSPACE_INSTALL_DEPLOYER} - INSTALL_LINUXBREW=${WORKSPACE_INSTALL_LINUXBREW} - INSTALL_MC=${WORKSPACE_INSTALL_MC} + - INSTALL_SYMFONY=${WORKSPACE_INSTALL_SYMFONY} + - INSTALL_PYTHON=${WORKSPACE_INSTALL_PYTHON} - INSTALL_IMAGE_OPTIMIZERS=${WORKSPACE_INSTALL_IMAGE_OPTIMIZERS} - PUID=${WORKSPACE_PUID} - PGID=${WORKSPACE_PGID}