Reduce the number of layers.

Author: wernight

Dockerfile

@@ -2,6 +2,11 @@ FROM debian:jessie
 
 MAINTAINER Werner Beroux <[email protected]>
 
+# Notes:
+# - libaa-bin is aafire
+# - perl, libcurses-perl and make are used to run asciiquarium for example.
+# - curl, watch, imagemagick, vlc and youtube-dl are just useful for so many of those commands.
+
 RUN apt-get update \
     && DEBIAN_FRONTEND=noninteractive apt-get install -y \
         aview \
@@ -27,40 +32,36 @@ RUN apt-get update \
         vlc \
         watch \
         xaos \
-    && apt-get clean \
-    && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
 
-# Install lolcat and youtube-dl
-RUN echo "deb http://http.us.debian.org/debian sid main non-free contrib" >> /etc/apt/sources.list
-RUN apt-get update \
+    && echo "Install lolcat and youtube-dl" \
+    && echo "deb http://http.us.debian.org/debian sid main non-free contrib" >> /etc/apt/sources.list \
+    && apt-get update \
     && DEBIAN_FRONTEND=noninteractive apt-get install -y \
         lolcat \
         youtube-dl \
-    && apt-get clean \
-    && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
 
-# Notes:
-# - libaa-bin is aafire
-# - perl, libcurses-perl and make are used to run asciiquarium for example.
-# - curl, watch, imagemagick, vlc and youtube-dl are just useful for so many of those commands.
-
-# Install asciiquarium
-RUN cpan -i Term::Animation \
+    && echo "Install asciiquarium" \
+    && cpan -i Term::Animation \
     && curl -L http://www.robobunny.com/projects/asciiquarium/asciiquarium.tar.gz -o asciiquarium.tar.gz \
     && tar -zxvf asciiquarium.tar.gz asciiquarium_1.1/asciiquarium \
     && cp asciiquarium_1.1/asciiquarium /usr/local/bin \
     && chmod 0755 /usr/local/bin/asciiquarium \
-    && rm -rf asciiquarium_1.1 asciiquarium.tar.gz
+    && rm -rf asciiquarium_1.1 asciiquarium.tar.gz \
+
+    && echo "Install Falling Hearts" \
+    && curl -L https://yjl.googlecode.com/hg/Bash/falling-%3C3s.sh -o /usr/local/bin/falling-hearts \
+    && chmod +x /usr/local/bin/falling-hearts \
 
-# Install Falling Hearts
-RUN curl -L https://yjl.googlecode.com/hg/Bash/falling-%3C3s.sh -o /usr/local/bin/falling-hearts \
-    && chmod +x /usr/local/bin/falling-hearts
+    && echo "Install pipes" \
+    && curl -L https://gist.githubusercontent.com/livibetter/4689307/raw/949e43fe2962c2c97c8b1d974ff93dd053d9bd37/pipes.sh -o /usr/local/bin/pipes \
+    && chmod +x /usr/local/bin/pipes \
+
+    && echo "Clean-up" \
+    && apt-get clean \
+    && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* \
 
-# Install pipes
-RUN curl -L https://gist.githubusercontent.com/livibetter/4689307/raw/949e43fe2962c2c97c8b1d974ff93dd053d9bd37/pipes.sh -o /usr/local/bin/pipes \
-    && chmod +x /usr/local/bin/pipes
+    && useradd --uid 666 -m --shell /usr/sbin/nologin john
 
-RUN useradd --uid 666 -m --shell /usr/sbin/nologin john
 USER john
 
 # Include /usr/games in PATH