diff --git a/Dockerfile b/Dockerfile index e89e30e6..b32258dd 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,12 +1,12 @@ -FROM debian:wheezy +FROM debian:jessie MAINTAINER bibi21000 -ADD . /home/docker-py2 -WORKDIR /home/docker-py2 -RUN apt-get update && apt-get install -y make python sudo -RUN make python-deps -RUN make autobuild-deps +ADD . /home/docker-py3 +WORKDIR /home/docker-py3 +RUN apt-get update && apt-get install -y make python3 sudo +RUN make PYTHON_EXEC=python3 python-deps +RUN make PYTHON_EXEC=python3 autobuild-deps RUN env -RUN make update -RUN make build -RUN make install -RUN make autobuild-tests +RUN make PYTHON_EXEC=python3 update +RUN make PYTHON_EXEC=python3 build +RUN make PYTHON_EXEC=python3 install +RUN make PYTHON_EXEC=python3 autobuild-tests diff --git a/Makefile b/Makefile index 339d1e57..0a161590 100644 --- a/Makefile +++ b/Makefile @@ -160,7 +160,6 @@ endif tests-deps: ${PIP_EXEC} install nose-html - ${PIP_EXEC} install nose-progressive ${PIP_EXEC} install coverage ${PIP_EXEC} install nose ${PIP_EXEC} install pylint diff --git a/circle.yml b/circle.yml index 410a0227..77457d5c 100644 --- a/circle.yml +++ b/circle.yml @@ -8,11 +8,12 @@ dependencies: pre: - sudo apt-get update - - sudo make python-deps - - sudo make autobuild-deps - - make update - - make build - - sudo make install + - make PYTHON_EXEC=python3 python-deps + - make PYTHON_EXEC=python3 autobuild-deps + - make PYTHON_EXEC=python3 update + - make PYTHON_EXEC=python3 build + - make PYTHON_EXEC=python3 install + - make PYTHON_EXEC=python3 update test: override: - - make autobuild-tests + - make PYTHON_EXEC=python3 autobuild-tests