From d78e5281fe1ad993881e4ee77fd7ea42ee252213 Mon Sep 17 00:00:00 2001
From: Emilien Devos <contact@emiliendevos.be>
Date: Tue, 24 Aug 2021 23:12:19 +0200
Subject: [PATCH] use pre-compiled lsquic docker image from
 https://quay.io/repository/invidious/lsquic-compiled fixes #2325

---
 docker/Dockerfile       | 33 +--------------------------------
 docker/Dockerfile.arm64 | 33 +--------------------------------
 2 files changed, 2 insertions(+), 64 deletions(-)

diff --git a/docker/Dockerfile b/docker/Dockerfile
index 7742ee39..d3d69af6 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -1,34 +1,3 @@
-FROM alpine:edge AS liblsquic-builder
-WORKDIR /src
-
-RUN apk add --no-cache build-base git apk-tools abuild cmake go perl linux-headers
-
-RUN abuild-keygen -a -n && \
-    cp /root/.abuild/-*.rsa.pub /etc/apk/keys/
-
-COPY docker/APKBUILD-boringssl boringssl/APKBUILD
-RUN cd boringssl && abuild -F -r && cd ..
-
-RUN apk add --repository /root/packages/src boringssl boringssl-dev boringssl-static
-
-RUN apk add --no-cache zlib-dev zlib-static libevent-dev libevent-static
-
-COPY docker/APKBUILD-lsquic lsquic/APKBUILD
-RUN cd lsquic && abuild -F -r && cd ..
-
-RUN apk add --repository /root/packages/src lsquic-static
-
-RUN mkdir tmp && cd tmp && \
-    ar -x /usr/lib/libssl.a && \
-    ar -x /usr/lib/libcrypto.a && \
-    ar -x /usr/lib/liblsquic.a && \
-    ar rc liblsquic.a *.o && \
-    strip --strip-unneeded liblsquic.a && \
-    ranlib liblsquic.a && \
-    cp liblsquic.a /root/liblsquic.a && \
-    cd .. && rm -rf tmp
-
-
 FROM crystallang/crystal:1.1.1-alpine AS builder
 RUN apk add --no-cache sqlite-static yaml-static
 
@@ -37,7 +6,7 @@ COPY ./shard.yml ./shard.yml
 COPY ./shard.lock ./shard.lock
 RUN shards install
 
-COPY --from=liblsquic-builder /root/liblsquic.a ./lib/lsquic/src/lsquic/ext/liblsquic.a
+COPY --from=quay.io/invidious/lsquic-compiled /root/liblsquic.a ./lib/lsquic/src/lsquic/ext/liblsquic.a
 
 COPY ./src/ ./src/
 # TODO: .git folder is required for building – this is destructive.
diff --git a/docker/Dockerfile.arm64 b/docker/Dockerfile.arm64
index 54226b66..84084a06 100644
--- a/docker/Dockerfile.arm64
+++ b/docker/Dockerfile.arm64
@@ -1,34 +1,3 @@
-FROM alpine:3.14 AS liblsquic-builder
-WORKDIR /src
-
-RUN apk add --no-cache build-base git apk-tools abuild cmake go perl linux-headers
-
-RUN abuild-keygen -a -n && \
-    cp /root/.abuild/-*.rsa.pub /etc/apk/keys/
-
-COPY docker/APKBUILD-boringssl boringssl/APKBUILD
-RUN cd boringssl && abuild -F -r && cd ..
-
-RUN apk add --repository /root/packages/src boringssl boringssl-dev boringssl-static
-
-RUN apk add --no-cache zlib-dev zlib-static libevent-dev libevent-static
-
-COPY docker/APKBUILD-lsquic lsquic/APKBUILD
-RUN cd lsquic && abuild -F -r && cd ..
-
-RUN apk add --repository /root/packages/src lsquic-static
-
-RUN mkdir tmp && cd tmp && \
-    ar -x /usr/lib/libssl.a && \
-    ar -x /usr/lib/libcrypto.a && \
-    ar -x /usr/lib/liblsquic.a && \
-    ar rc liblsquic.a *.o && \
-    strip --strip-unneeded liblsquic.a && \
-    ranlib liblsquic.a && \
-    cp liblsquic.a /root/liblsquic.a && \
-    cd .. && rm -rf tmp
-
-
 FROM alpine:3.14 AS builder
 RUN apk add --no-cache 'crystal<2' shards sqlite-static yaml-static yaml-dev libxml2-dev zlib-static openssl-libs-static openssl-dev musl-dev
 
@@ -37,7 +6,7 @@ COPY ./shard.yml ./shard.yml
 COPY ./shard.lock ./shard.lock
 RUN shards install
 
-COPY --from=liblsquic-builder /root/liblsquic.a ./lib/lsquic/src/lsquic/ext/liblsquic.a
+COPY --from=quay.io/invidious/lsquic-compiled /root/liblsquic.a ./lib/lsquic/src/lsquic/ext/liblsquic.a
 
 COPY ./src/ ./src/
 # TODO: .git folder is required for building – this is destructive.