diff --git a/.dockerignore b/.dockerignore index c0ef1859c3910115fecd9868fdaef4f2da59fc1f..efc254ab7641d7d7ab57854f9660deced984a109 100644 --- a/.dockerignore +++ b/.dockerignore @@ -1,6 +1,7 @@ .git/ build/ dist/ +Docker/ docs/build/ *.egg-info/ venv/ diff --git a/Docker/Dockerfile-base b/Docker/Dockerfile-base index 5e21f8e48bdf4282985b5f77895a3137f74684b5..7b90a6bfcb4bc12291a7656c596c08d38c922ffe 100644 --- a/Docker/Dockerfile-base +++ b/Docker/Dockerfile-base @@ -136,11 +136,12 @@ RUN git clone --no-checkout \ # This way, we are sure that the latest versions of `pip`, `setuptools`, and # `wheel` are installed in /usr/local, the only directory we're going to copy # over to the next build stage. -RUN wget https://bootstrap.pypa.io/get-pip.py && \ +RUN wget -q https://bootstrap.pypa.io/get-pip.py && \ python3 get-pip.py # Install required python packages RUN python3 -m pip install --no-cache-dir --upgrade \ + nodejs-wheel \ toil[cwl] # Install current version of LINC. By adding this to the base image @@ -220,7 +221,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ libpython3.8 \ libsigc++-2.0-0v5 \ libstdc++6 \ - nodejs \ python3 \ python3-casacore \ python3-distutils \