dockerfiles: improve consistency, link python to python3

Explictly select python 3.  The `python2` and `python` packages will
be removed from Ubuntu.  Until each call site is fixed, install a
/usr/local/bin/python symbolic link as a non-intrusive work-around
(.deb packages do not interfer with /usr/local).

Add an explicit maintainer for bbc-basic.

Undo some cosmetic changes in order to reduce the global diff, this
merge request will probably be sqashed before acceptance.

Move lib{readline,edit}-dev out of the generic part.

Use existing .deb packages for GHDL and vim.

impls/ada.2/Dockerfile

@@ -9,7 +9,8 @@ MAINTAINER Joel Martin <github@martintribe.org>
 RUN apt-get -y update
 
 # Required for running tests
-RUN apt-get -y install make python
+RUN apt-get -y install make python3
+RUN ln -fs /usr/bin/python3 /usr/local/bin/python
 
 RUN mkdir -p /mal
 WORKDIR /mal

impls/ada/Dockerfile

@@ -11,7 +11,8 @@ LABEL org.opencontainers.image.description="mal test container: ada"
 RUN apt-get -y update
 
 # Required for running tests
-RUN apt-get -y install make python
+RUN apt-get -y install make python3
+RUN ln -fs /usr/bin/python3 /usr/local/bin/python
 
 RUN mkdir -p /mal
 WORKDIR /mal

impls/awk/Dockerfile

@@ -9,7 +9,8 @@ MAINTAINER Joel Martin <github@martintribe.org>
 RUN apt-get -y update
 
 # Required for running tests
-RUN apt-get -y install make python
+RUN apt-get -y install make python3
+RUN ln -fs /usr/bin/python3 /usr/local/bin/python
 
 RUN mkdir -p /mal
 WORKDIR /mal

impls/bash/Dockerfile

@@ -9,7 +9,8 @@ MAINTAINER Joel Martin <github@martintribe.org>
 RUN apt-get -y update
 
 # Required for running tests
-RUN apt-get -y install make python
+RUN apt-get -y install make python3
+RUN ln -fs /usr/bin/python3 /usr/local/bin/python
 
 RUN mkdir -p /mal
 WORKDIR /mal

impls/bbc-basic/Dockerfile

@@ -9,7 +9,8 @@ MAINTAINER Joel Martin <github@martintribe.org>
 RUN apt-get -y update
 
 # Required for running tests
-RUN apt-get -y install make python
+RUN apt-get -y install make python3
+RUN ln -fs /usr/bin/python3 /usr/local/bin/python
 
 RUN mkdir -p /mal
 WORKDIR /mal

impls/clojure/Dockerfile

@@ -9,10 +9,8 @@ MAINTAINER Joel Martin <github@martintribe.org>
 RUN apt-get -y update
 
 # Required for running tests
-RUN apt-get -y install make python
-
-# Some typical implementation and test requirements
-RUN apt-get -y install curl libreadline-dev libedit-dev
+RUN apt-get -y install make python3
+RUN ln -fs /usr/bin/python3 /usr/local/bin/python
 
 RUN mkdir -p /mal
 WORKDIR /mal
@@ -21,11 +19,15 @@ WORKDIR /mal
 # Specific implementation requirements
 ##########################################################
 
+RUN apt-get -y install curl libreadline-dev libedit-dev
+
 #
 # Clojure (Java and lein)
 #
 
 RUN apt-get -y install leiningen
+ENV LEIN_HOME /mal/.lein
+ENV LEIN_JVM_OPTS -Duser.home=/mal
 
 #
 # ClojureScript (Node and Lumo)

impls/coffee/Dockerfile

@@ -9,7 +9,8 @@ MAINTAINER Joel Martin <github@martintribe.org>
 RUN apt-get -y update
 
 # Required for running tests
-RUN apt-get -y install make python
+RUN apt-get -y install make python3
+RUN ln -fs /usr/bin/python3 /usr/local/bin/python
 
 RUN mkdir -p /mal
 WORKDIR /mal
@@ -19,3 +20,5 @@ WORKDIR /mal
 ##########################################################
 
 RUN DEBIAN_FRONTEND=noninteractive apt-get -y install coffeescript g++ libreadline-dev npm
+ENV NPM_CONFIG_CACHE /mal/.npm
+RUN touch /.coffee_history && chmod go+w /.coffee_history

impls/common-lisp/Dockerfile

@@ -1,4 +1,4 @@
-FROM ubuntu:xenial
+FROM ubuntu:20.04
 MAINTAINER Joel Martin <github@martintribe.org>
 
 ##########################################################
@@ -9,10 +9,8 @@ MAINTAINER Joel Martin <github@martintribe.org>
 RUN apt-get -y update
 
 # Required for running tests
-RUN apt-get -y install make python
-
-# Some typical implementation and test requirements
-RUN apt-get -y install curl libreadline-dev libedit-dev
+RUN apt-get -y install make python3
+RUN ln -fs /usr/bin/python3 /usr/local/bin/python
 
 RUN mkdir -p /mal
 WORKDIR /mal
@@ -21,8 +19,7 @@ WORKDIR /mal
 # Specific implementation requirements
 ##########################################################
 
-# Install git, make
-RUN apt-get -y install git make
+RUN apt-get -y install curl git libreadline-dev libedit-dev
 
 # Install sbcl
 RUN apt-get -y install sbcl

impls/cpp/Dockerfile

@@ -9,7 +9,8 @@ MAINTAINER Joel Martin <github@martintribe.org>
 RUN apt-get -y update
 
 # Required for running tests
-RUN apt-get -y install make python
+RUN apt-get -y install make python3
+RUN ln -fs /usr/bin/python3 /usr/local/bin/python
 
 RUN mkdir -p /mal
 WORKDIR /mal
@@ -18,4 +19,5 @@ WORKDIR /mal
 # Specific implementation requirements
 ##########################################################
 
+# Install g++ for any C/C++ based implementations
 RUN apt-get -y install g++ libreadline-dev

impls/cs/Dockerfile

@@ -9,7 +9,8 @@ MAINTAINER Joel Martin <github@martintribe.org>
 RUN apt-get -y update
 
 # Required for running tests
-RUN apt-get -y install make python
+RUN apt-get -y install make python3
+RUN ln -fs /usr/bin/python3 /usr/local/bin/python
 
 RUN mkdir -p /mal
 WORKDIR /mal

impls/elisp/Dockerfile

@@ -9,7 +9,8 @@ MAINTAINER Joel Martin <github@martintribe.org>
 RUN apt-get -y update
 
 # Required for running tests
-RUN apt-get -y install make python
+RUN apt-get -y install make python3
+RUN ln -fs /usr/bin/python3 /usr/local/bin/python
 
 RUN mkdir -p /mal
 WORKDIR /mal

impls/elixir/Dockerfile

@@ -9,7 +9,8 @@ MAINTAINER Joel Martin <github@martintribe.org>
 RUN apt-get -y update
 
 # Required for running tests
-RUN apt-get -y install make python
+RUN apt-get -y install make python3
+RUN ln -fs /usr/bin/python3 /usr/local/bin/python
 
 RUN mkdir -p /mal
 WORKDIR /mal
@@ -18,4 +19,5 @@ WORKDIR /mal
 # Specific implementation requirements
 ##########################################################
 
+# Elixir
 RUN apt-get install -y elixir

impls/erlang/Dockerfile

@@ -9,7 +9,8 @@ MAINTAINER Joel Martin <github@martintribe.org>
 RUN apt-get -y update
 
 # Required for running tests
-RUN apt-get -y install make python
+RUN apt-get -y install make python3
+RUN ln -fs /usr/bin/python3 /usr/local/bin/python
 
 RUN mkdir -p /mal
 WORKDIR /mal

impls/es6/Dockerfile

@@ -9,7 +9,8 @@ MAINTAINER Joel Martin <github@martintribe.org>
 RUN apt-get -y update
 
 # Required for running tests
-RUN apt-get -y install make python
+RUN apt-get -y install make python3
+RUN ln -fs /usr/bin/python3 /usr/local/bin/python
 
 RUN mkdir -p /mal
 WORKDIR /mal
@@ -19,3 +20,5 @@ WORKDIR /mal
 ##########################################################
 
 RUN DEBIAN_FRONTEND=noninteractive apt-get install -y g++ libreadline-dev npm
+
+ENV NPM_CONFIG_CACHE /mal/.npm

impls/factor/Dockerfile

@@ -9,7 +9,8 @@ MAINTAINER Joel Martin <github@martintribe.org>
 RUN apt-get -y update
 
 # Required for running tests
-RUN apt-get -y install make python
+RUN apt-get -y install make python3
+RUN ln -fs /usr/bin/python3 /usr/local/bin/python
 
 RUN mkdir -p /mal
 WORKDIR /mal
@@ -20,7 +21,8 @@ WORKDIR /mal
 
 RUN DEBIAN_FRONTEND=noninteractive apt-get -y install ca-certificates curl libgtkglext1-dev libreadline-dev
 
-ENV HOME /mal
-
 RUN curl https://downloads.factorcode.org/releases/0.98/factor-linux-x86-64-0.98.tar.gz | tar -xzC/opt
-RUN ln -fst/usr/local/bin /opt/factor/factor
+ENV PATH /opt/factor:$PATH
+
+# Allow /mal/factor to create the $HOME/.cache directory.
+ENV HOME /mal

impls/fsharp/Dockerfile

@@ -9,7 +9,8 @@ MAINTAINER Joel Martin <github@martintribe.org>
 RUN apt-get -y update
 
 # Required for running tests
-RUN apt-get -y install make python
+RUN apt-get -y install make python3
+RUN ln -fs /usr/bin/python3 /usr/local/bin/python
 
 RUN mkdir -p /mal
 WORKDIR /mal

impls/gnu-smalltalk/Dockerfile

@@ -9,7 +9,8 @@ MAINTAINER Joel Martin <github@martintribe.org>
 RUN apt-get -y update
 
 # Required for running tests
-RUN apt-get -y install make python
+RUN apt-get -y install make python3
+RUN ln -fs /usr/bin/python3 /usr/local/bin/python
 
 RUN mkdir -p /mal
 WORKDIR /mal

impls/go/Dockerfile

@@ -9,7 +9,8 @@ MAINTAINER Joel Martin <github@martintribe.org>
 RUN apt-get -y update
 
 # Required for running tests
-RUN apt-get -y install make python
+RUN apt-get -y install make python3
+RUN ln -fs /usr/bin/python3 /usr/local/bin/python
 
 RUN mkdir -p /mal
 WORKDIR /mal

impls/groovy/Dockerfile

@@ -9,7 +9,8 @@ MAINTAINER Joel Martin <github@martintribe.org>
 RUN apt-get -y update
 
 # Required for running tests
-RUN apt-get -y install make python
+RUN apt-get -y install make python3
+RUN ln -fs /usr/bin/python3 /usr/local/bin/python
 
 RUN mkdir -p /mal
 WORKDIR /mal

impls/guile/Dockerfile

@@ -9,7 +9,8 @@ MAINTAINER Joel Martin <github@martintribe.org>
 RUN apt-get -y update
 
 # Required for running tests
-RUN apt-get -y install make python
+RUN apt-get -y install make python3
+RUN ln -fs /usr/bin/python3 /usr/local/bin/python
 
 RUN mkdir -p /mal
 WORKDIR /mal
@@ -18,4 +19,5 @@ WORKDIR /mal
 # Specific implementation requirements
 ##########################################################
 
+# Guile
 RUN apt-get -y install guile-3.0 libpcre3-dev

impls/haskell/Dockerfile

@@ -9,7 +9,8 @@ MAINTAINER Joel Martin <github@martintribe.org>
 RUN apt-get -y update
 
 # Required for running tests
-RUN apt-get -y install make python
+RUN apt-get -y install make python3
+RUN ln -fs /usr/bin/python3 /usr/local/bin/python
 
 RUN mkdir -p /mal
 WORKDIR /mal
@@ -18,4 +19,5 @@ WORKDIR /mal
 # Specific implementation requirements
 ##########################################################
 
+RUN apt-get -y install make python
 RUN apt-get install -y ghc libghc-readline-dev

impls/haxe/Dockerfile

@@ -9,7 +9,8 @@ MAINTAINER Joel Martin <github@martintribe.org>
 RUN apt-get -y update
 
 # Required for running tests
-RUN apt-get -y install make python
+RUN apt-get -y install make python3
+RUN ln -fs /usr/bin/python3 /usr/local/bin/python
 
 RUN mkdir -p /mal
 WORKDIR /mal
@@ -18,7 +19,8 @@ WORKDIR /mal
 # Specific implementation requirements
 ##########################################################
 
-RUN DEBIAN_FRONTEND=noninteractive apt-get -y install g++ haxe libreadline-dev npm python3
+# Haxe
+RUN DEBIAN_FRONTEND=noninteractive apt-get -y install g++ haxe libreadline-dev npm
 
 ENV NPM_CONFIG_CACHE /mal/.npm
 ENV HOME /

impls/java/Dockerfile

@@ -1,4 +1,4 @@
-FROM ubuntu:10.04
+FROM ubuntu:20.04
 MAINTAINER Joel Martin <github@martintribe.org>
 
 ##########################################################
@@ -9,7 +9,8 @@ MAINTAINER Joel Martin <github@martintribe.org>
 RUN apt-get -y update
 
 # Required for running tests
-RUN apt-get -y install make python
+RUN apt-get -y install make python3
+RUN ln -fs /usr/bin/python3 /usr/local/bin/python
 
 RUN mkdir -p /mal
 WORKDIR /mal
@@ -20,3 +21,4 @@ WORKDIR /mal
 
 # Java and maven
 RUN apt-get -y install default-jdk-headless maven
+ENV MAVEN_OPTS -Duser.home=/mal

impls/js/Dockerfile

@@ -9,7 +9,8 @@ MAINTAINER Joel Martin <github@martintribe.org>
 RUN apt-get -y update
 
 # Required for running tests
-RUN apt-get -y install make python
+RUN apt-get -y install make python3
+RUN ln -fs /usr/bin/python3 /usr/local/bin/python
 
 RUN mkdir -p /mal
 WORKDIR /mal
@@ -19,3 +20,5 @@ WORKDIR /mal
 ##########################################################
 
 RUN DEBIAN_FRONTEND=noninteractive apt-get -y install g++ libreadline-dev nodejs npm
+
+ENV NPM_CONFIG_CACHE /mal/.npm

impls/logo/Dockerfile

@@ -9,8 +9,8 @@ MAINTAINER Joel Martin <github@martintribe.org>
 RUN apt-get -y update
 
 # Required for running tests
-RUN apt-get -y install make python2
-RUN ln -s /usr/bin/python2 /usr/local/bin/python
+RUN apt-get -y install make python3
+RUN ln -fs /usr/bin/python3 /usr/local/bin/python
 
 RUN mkdir -p /mal
 WORKDIR /mal

impls/miniMAL/Dockerfile

@@ -12,7 +12,7 @@ RUN apt-get -y update
 
 # Required for running tests
 RUN apt-get -y install make python3
-RUN ln -sf /usr/bin/python3 /usr/bin/python
+RUN ln -fs /usr/bin/python3 /usr/local/bin/python
 
 RUN mkdir -p /mal
 WORKDIR /mal

impls/nasm/Dockerfile

@@ -9,7 +9,8 @@ MAINTAINER Joel Martin <github@martintribe.org>
 RUN apt-get -y update
 
 # Required for running tests
-RUN apt-get -y install make python
+RUN apt-get -y install make python3
+RUN ln -fs /usr/bin/python3 /usr/local/bin/python
 
 RUN mkdir -p /mal
 WORKDIR /mal
@@ -20,4 +21,3 @@ WORKDIR /mal
 
 # Install nasm and ld
 RUN apt-get -y install nasm binutils
-

impls/nim/Dockerfile

@@ -9,7 +9,8 @@ MAINTAINER Joel Martin <github@martintribe.org>
 RUN apt-get -y update
 
 # Required for running tests
-RUN apt-get -y install make python
+RUN apt-get -y install make python3
+RUN ln -fs /usr/bin/python3 /usr/local/bin/python
 
 RUN mkdir -p /mal
 WORKDIR /mal
@@ -18,6 +19,7 @@ WORKDIR /mal
 # Specific implementation requirements
 ##########################################################
 
-RUN apt-get -y install gcc libc-dev nim
+# Nim
+RUN apt-get -y install gcc libc-dev libreadline-dev nim
 
 ENV HOME /mal

impls/perl/Dockerfile

@@ -9,7 +9,8 @@ MAINTAINER Joel Martin <github@martintribe.org>
 RUN apt-get -y update
 
 # Required for running tests
-RUN apt-get -y install make python
+RUN apt-get -y install make python3
+RUN ln -fs /usr/bin/python3 /usr/local/bin/python
 
 RUN mkdir -p /mal
 WORKDIR /mal

impls/php/Dockerfile

@@ -9,7 +9,8 @@ MAINTAINER Joel Martin <github@martintribe.org>
 RUN apt-get -y update
 
 # Required for running tests
-RUN apt-get -y install make python
+RUN apt-get -y install make python3
+RUN ln -fs /usr/bin/python3 /usr/local/bin/python
 
 RUN mkdir -p /mal
 WORKDIR /mal

impls/picolisp/Dockerfile

@@ -9,7 +9,8 @@ MAINTAINER Joel Martin <github@martintribe.org>
 RUN apt-get -y update
 
 # Required for running tests
-RUN apt-get -y install make python
+RUN apt-get -y install make python3
+RUN ln -fs /usr/bin/python3 /usr/local/bin/python
 
 RUN mkdir -p /mal
 WORKDIR /mal

impls/pike/Dockerfile

@@ -9,7 +9,8 @@ MAINTAINER Joel Martin <github@martintribe.org>
 RUN apt-get -y update
 
 # Required for running tests
-RUN apt-get -y install make python
+RUN apt-get -y install make python3
+RUN ln -fs /usr/bin/python3 /usr/local/bin/python
 
 RUN mkdir -p /mal
 WORKDIR /mal

impls/prolog/Dockerfile

@@ -9,7 +9,8 @@ MAINTAINER Joel Martin <github@martintribe.org>
 RUN apt-get -y update
 
 # Required for running tests
-RUN apt-get -y install make python
+RUN apt-get -y install make python3
+RUN ln -fs /usr/bin/python3 /usr/local/bin/python
 
 RUN mkdir -p /mal
 WORKDIR /mal

impls/python/Dockerfile

@@ -9,7 +9,8 @@ MAINTAINER Joel Martin <github@martintribe.org>
 RUN apt-get -y update
 
 # Required for running tests
-RUN apt-get -y install make python
+RUN apt-get -y install make python3
+RUN ln -fs /usr/bin/python3 /usr/local/bin/python
 
 RUN mkdir -p /mal
 WORKDIR /mal
@@ -18,8 +19,7 @@ WORKDIR /mal
 # Specific implementation requirements
 ##########################################################
 
-# Nothing additional needed for python
-RUN apt-get -y install python3
+RUN apt-get -y install python2
 
 # For dist packaging
 RUN apt-get -y install zip

impls/r/Dockerfile

@@ -9,7 +9,8 @@ MAINTAINER Joel Martin <github@martintribe.org>
 RUN apt-get -y update
 
 # Required for running tests
-RUN apt-get -y install make python
+RUN apt-get -y install make python3
+RUN ln -fs /usr/bin/python3 /usr/local/bin/python
 
 RUN mkdir -p /mal
 WORKDIR /mal

impls/racket/Dockerfile

@@ -9,7 +9,8 @@ MAINTAINER Joel Martin <github@martintribe.org>
 RUN apt-get -y update
 
 # Required for running tests
-RUN apt-get -y install make python
+RUN apt-get -y install make python3
+RUN ln -fs /usr/bin/python3 /usr/local/bin/python
 
 RUN mkdir -p /mal
 WORKDIR /mal
@@ -18,4 +19,5 @@ WORKDIR /mal
 # Specific implementation requirements
 ##########################################################
 
+# Racket
 RUN apt-get -y install libedit-dev racket

impls/ruby/Dockerfile

@@ -9,7 +9,8 @@ MAINTAINER Joel Martin <github@martintribe.org>
 RUN apt-get -y update
 
 # Required for running tests
-RUN apt-get -y install make python
+RUN apt-get -y install make python3
+RUN ln -fs /usr/bin/python3 /usr/local/bin/python
 
 RUN mkdir -p /mal
 WORKDIR /mal

impls/rust/Dockerfile

@@ -9,7 +9,8 @@ MAINTAINER Joel Martin <github@martintribe.org>
 RUN apt-get -y update
 
 # Required for running tests
-RUN apt-get -y install make python
+RUN apt-get -y install make python3
+RUN ln -fs /usr/bin/python3 /usr/local/bin/python
 
 RUN mkdir -p /mal
 WORKDIR /mal

impls/skew/Dockerfile

@@ -9,7 +9,8 @@ MAINTAINER Joel Martin <github@martintribe.org>
 RUN apt-get -y update
 
 # Required for running tests
-RUN apt-get -y install make python
+RUN apt-get -y install make python3
+RUN ln -fs /usr/bin/python3 /usr/local/bin/python
 
 RUN mkdir -p /mal
 WORKDIR /mal

impls/sml/Dockerfile

@@ -7,12 +7,8 @@ FROM ubuntu:focal
 ##########################################################
 
 RUN apt-get -y update
-
-# Required for running tests
-RUN apt-get -y install make python
-
-# Some typical implementation and test requirements
-RUN apt-get -y install curl libreadline-dev libedit-dev
+RUN apt-get -y install make python3
+RUN ln -s /usr/bin/python3 /usr/local/bin/python
 
 RUN mkdir -p /mal
 WORKDIR /mal

impls/tcl/Dockerfile

@@ -9,7 +9,8 @@ MAINTAINER Joel Martin <github@martintribe.org>
 RUN apt-get -y update
 
 # Required for running tests
-RUN apt-get -y install make python
+RUN apt-get -y install make python3
+RUN ln -fs /usr/bin/python3 /usr/local/bin/python
 
 RUN mkdir -p /mal
 WORKDIR /mal

impls/ts/Dockerfile

@@ -9,7 +9,8 @@ MAINTAINER Joel Martin <github@martintribe.org>
 RUN apt-get -y update
 
 # Required for running tests
-RUN apt-get -y install make python
+RUN apt-get -y install make python3
+RUN ln -fs /usr/bin/python3 /usr/local/bin/python
 
 RUN mkdir -p /mal
 WORKDIR /mal

impls/vhdl/Dockerfile

@@ -1,4 +1,4 @@
-FROM ubuntu:14.04
+FROM ubuntu:20.04
 MAINTAINER Joel Martin <github@martintribe.org>
 
 ##########################################################
@@ -9,10 +9,8 @@ MAINTAINER Joel Martin <github@martintribe.org>
 RUN apt-get -y update
 
 # Required for running tests
-RUN apt-get -y install make python
-
-# Some typical implementation and test requirements
-RUN apt-get -y install curl libreadline-dev libedit-dev
+RUN apt-get -y install make python3
+RUN ln -fs /usr/bin/python3 /usr/local/bin/python
 
 RUN mkdir -p /mal
 WORKDIR /mal
@@ -21,10 +19,6 @@ WORKDIR /mal
 # Specific implementation requirements
 ##########################################################
 
-RUN apt-get -y install software-properties-common && \
-    apt-add-repository -y ppa:pgavin/ghdl && \
-    apt-get update -y
-
-RUN apt-get -y install ghdl
+RUN apt-get -y install gcc ghdl ghdl-gcc
 
 ENV HOME /mal

impls/vimscript/Dockerfile

@@ -1,4 +1,4 @@
-FROM ubuntu:vivid
+FROM ubuntu:20.04
 MAINTAINER Joel Martin <github@martintribe.org>
 
 ##########################################################
@@ -9,10 +9,8 @@ MAINTAINER Joel Martin <github@martintribe.org>
 RUN apt-get -y update
 
 # Required for running tests
-RUN apt-get -y install make python
-
-# Some typical implementation and test requirements
-RUN apt-get -y install curl libreadline-dev libedit-dev
+RUN apt-get -y install make python3
+RUN ln -fs /usr/bin/python3 /usr/local/bin/python
 
 RUN mkdir -p /mal
 WORKDIR /mal
@@ -22,13 +20,8 @@ WORKDIR /mal
 ##########################################################
 
 # To build the readline plugin
-RUN apt-get -y install g++
+RUN apt-get -y install gcc libreadline-dev
 
-# Vim 8.0
-RUN apt-get -y install bzip2
-RUN cd /tmp && curl -O ftp://ftp.vim.org/pub/vim/unix/vim-8.0.tar.bz2 \
-    && tar xjf /tmp/vim-8.0.tar.bz2 \
-    && cd vim80 && make && make install \
-    && cd /tmp && rm -r /tmp/vim-8.0.tar.bz2 /tmp/vim80
+RUN apt-get -y install vim
 
 ENV HOME /mal

impls/xslt/Dockerfile

@@ -9,13 +9,14 @@ MAINTAINER Joel Martin <github@martintribe.org>
 RUN apt-get -y update
 
 # Required for running tests
-RUN apt-get -y install make python
+RUN apt-get -y install make python3
+RUN ln -fs /usr/bin/python3 /usr/local/bin/python
 
 RUN mkdir -p /mal
 WORKDIR /mal
 
-#########################################################
+##########################################################
 # Specific implementation requirements
-#########################################################
+##########################################################
 
-RUN apt-get -y install default-jdk-headless libsaxonhe-java python3
+RUN apt-get -y install default-jdk-headless libsaxonhe-java