From b329886441bfd6a7702e7c97f721385a5858a993 Mon Sep 17 00:00:00 2001
From: tleydxdy <koubeshio@tutanota.com>
Date: Mon, 27 Apr 2020 10:44:08 -0400
Subject: [PATCH] Small layer tweaks

---
 docker/Dockerfile | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/docker/Dockerfile b/docker/Dockerfile
index 5ae376fb..d0e4827a 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -3,16 +3,17 @@ RUN apk add --no-cache curl crystal shards libc-dev \
     yaml-dev libxml2-dev sqlite-dev zlib-dev openssl-dev \
     yaml-static sqlite-static zlib-static openssl-libs-static
 WORKDIR /invidious
-COPY ./shard.yml ./shard.yml
-RUN shards update && shards install && \
-    curl -Lo /etc/apk/keys/omarroth.rsa.pub https://github.com/omarroth/boringssl-alpine/releases/download/1.1.0-r0/omarroth.rsa.pub && \
+RUN curl -Lo /etc/apk/keys/omarroth.rsa.pub https://github.com/omarroth/boringssl-alpine/releases/download/1.1.0-r0/omarroth.rsa.pub && \
     curl -Lo boringssl-dev.apk https://github.com/omarroth/boringssl-alpine/releases/download/1.1.0-r0/boringssl-dev-1.1.0-r0.apk && \
     curl -Lo lsquic.apk https://github.com/omarroth/lsquic-alpine/releases/download/2.6.3-r0/lsquic-2.6.3-r0.apk && \
     apk verify --no-cache boringssl-dev.apk lsquic.apk && \
     tar -xf boringssl-dev.apk usr/lib/libcrypto.a usr/lib/libssl.a && \
     tar -xf lsquic.apk usr/lib/liblsquic.a && \
-    mv usr/lib/* lib/lsquic/src/lsquic/ext && \
-    rm -r usr boringssl-dev.apk lsquic.apk /root/.cache
+    rm /etc/apk/keys/omarroth.rsa.pub boringssl-dev.apk lsquic.apk
+COPY ./shard.yml ./shard.yml
+RUN shards update && shards install && \
+    mv ./usr/lib/* ./lib/lsquic/src/lsquic/ext && \
+    rm -r ./usr /root/.cache
 COPY ./src/ ./src/
 # TODO: .git folder is required for building – this is destructive.
 # See definition of CURRENT_BRANCH, CURRENT_COMMIT and CURRENT_VERSION.