From 1237d98579350529b2aa25d1fd24e01201874c92 Mon Sep 17 00:00:00 2001
From: "byte[]" <byteslice@airmail.cc>
Date: Wed, 27 May 2020 19:35:39 -0400
Subject: [PATCH] rearrange dockerfile

---
 docker/app/Dockerfile | 37 +++++++++++++++++++------------------
 1 file changed, 19 insertions(+), 18 deletions(-)

diff --git a/docker/app/Dockerfile b/docker/app/Dockerfile
index 870941fc..27353b9f 100644
--- a/docker/app/Dockerfile
+++ b/docker/app/Dockerfile
@@ -1,24 +1,25 @@
 FROM elixir:1.10.3
 
-# cache bust git repos
-ADD https://api.github.com/repos/derpibooru/cli_intensities/git/refs/heads/master /tmp/cli_intensities_version.json
-ADD https://api.github.com/repos/derpibooru/mediatools/git/refs/heads/master /tmp/mediatools_version.json
+RUN apt-get update \
+    && apt-get -qq -y install apt-transport-https \
+    && echo "deb https://deb.nodesource.com/node_12.x stretch main" >> /etc/apt/sources.list \
+    && echo "deb http://apt.postgresql.org/pub/repos/apt/ stretch-pgdg main" >> /etc/apt/sources.list \
+    && wget -qO - "https://www.postgresql.org/media/keys/ACCC4CF8.asc" | apt-key add - \
+    && wget -qO - "https://deb.nodesource.com/gpgkey/nodesource.gpg.key" | apt-key add - \
+    && apt-get update \
+    && apt-get -qq -y install inotify-tools postgresql-client build-essential git ffmpeg libavformat-dev libavcodec-dev libswscale-dev nodejs libmagic-dev libpng-dev gifsicle optipng libjpeg-progs librsvg2-bin \
+    && mix local.hex --force \
+    && mix local.rebar --force
 
-RUN apt-get update; \
-    apt-get -qq -y install apt-transport-https; \
-    echo "deb https://deb.nodesource.com/node_12.x stretch main" >> /etc/apt/sources.list; \
-    echo "deb http://apt.postgresql.org/pub/repos/apt/ stretch-pgdg main" >> /etc/apt/sources.list; \
-    wget -qO - https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add -; \
-    wget -qO - https://deb.nodesource.com/gpgkey/nodesource.gpg.key | apt-key add -; \
-    apt-get update; \
-    apt-get -qq -y install inotify-tools postgresql-client build-essential git ffmpeg libavformat-dev libavcodec-dev libswscale-dev nodejs libmagic-dev libpng-dev gifsicle optipng libjpeg-progs librsvg2-bin; \
-    cd /tmp; \
-    git clone https://github.com/derpibooru/cli_intensities; \
-    git clone https://github.com/derpibooru/mediatools; \
-    (cd cli_intensities && make install); \
-    (cd mediatools && make install); \
-    mix local.hex --force; \
-    mix local.rebar --force
+ADD https://api.github.com/repos/derpibooru/cli_intensities/git/refs/heads/master /tmp/cli_intensities_version.json
+RUN git clone https://github.com/derpibooru/cli_intensities /tmp/cli_intensities \
+    && cd /tmp/cli_intensities \
+    && make install
+
+ADD https://api.github.com/repos/derpibooru/mediatools/git/refs/heads/master /tmp/mediatools_version.json
+RUN git clone https://github.com/derpibooru/mediatools /tmp/mediatools \
+    && cd /tmp/mediatools \
+    && make install
 
 COPY docker/app/run-development /usr/local/bin/run-development
 COPY docker/app/safe-rsvg-convert /usr/local/bin/safe-rsvg-convert