From 4b51383ae9b8427bc9e0a9cca88f2efd8ed7b2ef Mon Sep 17 00:00:00 2001
From: tleydxdy <koubeshio@tutanota.com>
Date: Thu, 23 Apr 2020 21:41:10 -0400
Subject: [PATCH] Fix layer dependency

---
 docker/Dockerfile | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/docker/Dockerfile b/docker/Dockerfile
index b3ea9b0c..75654cb5 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -1,19 +1,18 @@
 FROM alpine:edge AS builder
 WORKDIR /invidious
-COPY ./shard.yml ./shard.yml
-RUN apk add crystal shards libc-dev \
+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 && \
-    shards update && shards install && \
-    apk add curl && \
+    yaml-static sqlite-static zlib-static openssl-libs-static
+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 && \
     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 boringssl-dev.apk lsquic.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 /var/cache/apk/*
+    rm -r usr boringssl-dev.apk lsquic.apk /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.