Merge pull request #396 from timjklein36/tk/bugfix-docker-build

Fix Docker Build Upgrading Python to 3.6

Dockerfile

@@ -2,16 +2,31 @@ FROM ubuntu:xenial
 
 ENV BLENDER_VERSION 2.81
 
+# Add Python 3.6 package repo
 RUN apt-get update
+RUN apt-get install -y software-properties-common
+RUN add-apt-repository ppa:deadsnakes/ppa
+
+# Update/upgrade and install system dependencies
+RUN apt-get update
+RUN apt-get upgrade -y
 RUN apt-get install --no-install-recommends -y \
     libsdl1.2debian \
-    libglu1 python3-pip \
+    libglu1 \
+    python3.6 \
+    python3.6-dev \
+    python3.6-venv \
     bash \
     wget \
     bzip2 \
     make \
     libxi6 \
     libxrender1
+
+# Retrieve and install pip for version 3.6 (not in above PPA)
+RUN wget https://bootstrap.pypa.io/get-pip.py
+RUN python3.6 get-pip.py
+
 RUN pip3 install --upgrade pip
 RUN pip3 install --upgrade setuptools
 

README.md

@@ -65,12 +65,12 @@ sudo docker build . -t godot_blender_exporter:latest
 
 To test:
 ```
-docker run --volume .:/tests/reference_exports godot_blender_exporter:latest compare
+docker run --volume `pwd`:/workdir godot_blender_exporter:latest compare
 ```
 
 To update reference exports:
 ```
-docker run --volume .:/tests/reference_exports godot_blender_exporter:latest export-blends update-examples
+docker run --volume `pwd`:/workdir godot_blender_exporter:latest export-blends update-examples
 ```
 
 ## License

tests/entrypoint.sh

@@ -1,4 +1,4 @@
 #!/bin/bash
 
 . ../.envs  # generated by install_blender.sh
-make BLENDER=${BLENDER_BIN} PYLINT='python3 -m pylint' $@
+make BLENDER=${BLENDER_BIN} PYLINT='pylint' $@