diff --git a/.circleci/Dockerfile b/.circleci/Dockerfile index 33e0c56f..40783e26 100644 --- a/.circleci/Dockerfile +++ b/.circleci/Dockerfile @@ -1,15 +1,8 @@ -FROM circleci/python:3.6 +FROM circleci/python:3.6-node USER root -RUN apt-get update && \ - apt-get install --assume-yes curl - -RUN curl --silent --location https://deb.nodesource.com/setup_10.x | bash - \ - && apt-get install --assume-yes nodejs \ - && npm install --global npm - -RUN npm install --global yarn \ +RUN apt-get update \ && apt-get install --assume-yes \ # Install Pillow dependencies # https://pillow.readthedocs.org/en/latest/installation.html) @@ -24,6 +17,9 @@ RUN npm install --global yarn \ python-tk \ # Install isic_archive dependencies p7zip-full \ - && pip3 install tox + && pip3 install \ + pip \ + setuptools \ + tox USER circleci