Combine Dockerfile RUN statements to reduce layer count. Also unify GPU pip install into CPU image.

Author: dster2

docker/build.sh

@@ -7,8 +7,7 @@ FROM gcr.io/kaggle-images/python:latest
 # install node and npm from nodesource https://github.com/nodesource/distributions
 # use a local mirror of the setup script to avoid `curl | bash`
 ADD docker/nodesource_setup_14.x.sh node_setup.sh
-RUN sh node_setup.sh
-RUN apt-get install -y nodejs
+RUN sh node_setup.sh && apt-get install -y nodejs
 
 # link the newly installed versions to /opt/node so we can prioritize these versions over the versions /opt/conda has.
 RUN mkdir /opt/node && \
@@ -20,8 +19,7 @@ ENV PATH /opt/node:$PATH
 ENV NODE_PATH /usr/lib/node_modules
 
 # confirm installation
-RUN node -v
-RUN npm -v
+RUN node -v && npm -v
 
 # END NODE
 
@@ -31,7 +29,6 @@ ADD ./setup.py ./setup.py
 ADD ./README.md ./README.md
 ADD ./MANIFEST.in ./MANIFEST.in
 ADD ./kaggle_environments ./kaggle_environments
-RUN pip install .
-RUN pytest
+RUN pip install Flask bitsandbytes accelerate && pip install . && pytest
 
 CMD kaggle-environments

docker/build_cpu.sh

@@ -7,8 +7,7 @@ FROM gcr.io/kaggle-gpu-images/python:latest
 # install node and npm from nodesource https://github.com/nodesource/distributions
 # use a local mirror of the setup script to avoid `curl | bash`
 ADD docker/nodesource_setup_14.x.sh node_setup.sh
-RUN sh node_setup.sh
-RUN apt-get install -y nodejs
+RUN sh node_setup.sh && apt-get install -y nodejs
 
 # link the newly installed versions to /opt/node so we can prioritize these versions over the versions /opt/conda has.
 RUN mkdir /opt/node && \
@@ -20,20 +19,16 @@ ENV PATH /opt/node:$PATH
 ENV NODE_PATH /usr/lib/node_modules
 
 # confirm installation
-RUN node -v
-RUN npm -v
+RUN node -v && npm -v
 
 # END NODE
 
 WORKDIR /usr/src/app/kaggle_environments
 
-RUN pip install Flask bitsandbytes accelerate
-
 ADD ./setup.py ./setup.py
 ADD ./README.md ./README.md
 ADD ./MANIFEST.in ./MANIFEST.in
 ADD ./kaggle_environments ./kaggle_environments
-RUN pip install .
-RUN pytest
+RUN pip install Flask bitsandbytes accelerate && pip install . && pytest
 
 CMD kaggle-environments