Merge pull request #15 from erinxocon/master

make better, make smaller

docker/bake.Dockerfile

@@ -1,13 +1,12 @@
 FROM kennethreitz/bake:core
 
+ARG DEBIAN_FRONTEND='noninteractive'
+
 ENV BAKEFILE_PATH /app/Bakefile
 
 # -- Install latest Bake.
 RUN set -ex && \
-    pip3 install bake-cli --upgrade --quiet > /dev/null
-
-# -- Really slim down that image.
-RUN set -ex && \
+    pip3 install bake-cli --upgrade --quiet > /dev/null && \
     rm -fr /var/lib/apt/lists
 
 # -- Copy Bakefile of depending Dockerfiles.

docker/ci.Dockerfile

@@ -2,6 +2,8 @@ FROM kennethreitz/bake:core
 
 ENV TERM xterm
 
+ARG DEBIAN_FRONTEND='noninteractive'
+
 # -- Install CircleCI CLI.
 RUN curl -fLSs https://circle.ci/cli --retry 3 | bash
 
@@ -9,19 +11,13 @@ RUN curl -fLSs https://circle.ci/cli --retry 3 | bash
 RUN set -ex && \
     apt-get update -qq && \
     apt-get upgrade -y -qq && \
+    apt-get install curl && \
     apt-get install expect npm -y -qq >/dev/null && \
     apt-get clean -y -qq && \
-    apt-get autoclean -y -qq
-
-# -- Install bats.
-RUN set -ex && npm install -g bats > /dev/null
-
-# -- Install latest Bake.
-RUN set -ex && \
-    pip3 install bake-cli --upgrade --quiet > /dev/null
-
-# -- Really slim down that image.
-RUN set -ex && \
-    rm -fr /var/lib/apt/lists
+    apt-get autoclean -y -qq && \
+    npm install -g bats > /dev/null && \
+    pip3 install bake-cli --upgrade --quiet > /dev/null && \
+    apt remove --autoremove --purge -y curl && \
+    rm -fr /var/lib/apt/lists/*
 
 ENTRYPOINT [ "bash" ]

docker/core.Dockerfile

@@ -1,7 +1,7 @@
-FROM ubuntu:19.04
+FROM python:3-slim
 
 # Tell Ubuntu to not prompt during apt installs.
-ENV DEBIAN_FRONTEND 'noninteractive'
+ARG DEBIAN_FRONTEND='noninteractive'
 
 # -- Setup mirrors, for faster downloads (main sources can be *very* slow sometimes).
 COPY ./docker/scripts/use-mirrors.sh /opt/use-mirrors.sh
@@ -10,24 +10,7 @@ RUN set -ex && \
     rm -fr /opt/use-mirrors.sh
 
 # -- System dependencies + common utilities.
-RUN set -ex && \
-    apt-get update -qq && \
-    apt-get upgrade -y -qq && \
-    apt-get install curl python3 git python3-distutils  -y -qq >/dev/null && \
-    apt-get clean -y -qq && \
-    apt-get autoclean -y -qq
-
-# -- Install pip.
-RUN set -ex && curl -s --retry 3 https://bootstrap.pypa.io/get-pip.py > /tmp/get-pip.py && \
-    python3 /tmp/get-pip.py > /dev/null && rm -fr /tmp/get-pip.py
-
-# -- Install hconfig.
-RUN set -ex && \
-    pip3 install pipenv --quiet --no-cache 2>/dev/null
-
-# -- Clean up.
-RUN set -ex && \
-    apt-get clean -y -qq && apt-get autoremove -y -qq && apt-get autoclean -y -qq
+RUN pip3 install pipenv --quiet --no-cache 2>/dev/null
 
 # -- Home directory.
 RUN set -ex && \

docker/red.Dockerfile

@@ -2,10 +2,7 @@ FROM kennethreitz/bake:core
 
 # -- Install latest Bake.
 RUN set -ex && \
-    pip3 install bake-cli --upgrade --quiet > /dev/null
-
-# -- Really slim down that image.
-RUN set -ex && \
+    pip3 install bake-cli --upgrade --quiet > /dev/null && \
     rm -fr /var/lib/apt/lists
 
 ENTRYPOINT [ "red" ]