Use docker and makefile variables for the dev_deps

Signed-off-by: Juanjo Alvarez <[email protected]>

Author: Juanjo Alvarez

Dockerfile.tpl

@@ -1,17 +1,22 @@
 FROM alpine:3.6
 MAINTAINER source{d}
 
-RUN apk add --no-cache --update python python3 py-pip py2-pip git
+ARG DEVDEPS=native/dev_deps
+ARG CONTAINER_DEVDEPS=/tmp/dev_deps
+ARG PYDETECTOR_VER=0.10.3
 
+RUN apk add --no-cache --update python python3 py-pip py2-pip git
 
 ADD build /opt/driver/bin
 ADD native/python_package /tmp/python_driver
 RUN pip3 install /tmp/python_driver
 RUN yes|rm -rf /tmp/python_driver
 
-ADD native/dev_deps /tmp/dev_deps
-RUN pip2 install -U /tmp/dev_deps/python-pydetector || pip2 install pydetector-bblfsh==0.10.3
-RUN pip3 install -U /tmp/dev_deps/python-pydetector || pip3 install pydetector-bblfsh==0.10.3
-RUN yes|rm -rf /tmp/dev_deps
+ADD ${DEVDEPS} ${CONTAINER_DEVDEPS}
+ENV ENV_DEVDEPS=${DEVDEPS}
+ENV ENV_PYDETECTOR_VER=${PYDETECTOR_VER}
+RUN pip2 install -U ${CONTAINER_DEVDEPS}/python-pydetector || pip2 install pydetector-bblfsh==${PYDETECTOR_VER}
+RUN pip3 install -U ${CONTAINER_DEVDEPS}/python-pydetector || pip3 install pydetector-bblfsh==${PYDETECTOR_VER}
+RUN yes|rm -rf ${CONTAINER_DEVDEPS}
 
 CMD /opt/driver/bin/driver

Makefile

@@ -1,5 +1,7 @@
+DEV_DEPS ?= native/dev_deps
+
 test-native-internal:
-	pip3 install --user native/dev_deps/python-pydetector/ || pip3 install --user pydetector-bblfsh
+	pip3 install --user ${DEV_DEPS}/python-pydetector/ || pip3 install --user pydetector-bblfsh
 	pip3 install --user git+https://github.com/python/mypy.git@0bb2d1680e8b9522108b38d203cb73021a617e64#egg=mypy-lang
 	cd native/python_package/test && \
 	python3 -m unittest discover