iv-org-mirror/invidious-copy-2023-06-08
1
0
Fork 0
mirror of https://gitea.invidious.io/iv-org/invidious-copy-2023-06-08.git synced 2024-08-15 00:53:38 +00:00
Code Issues Projects Releases Packages Wiki Activity

use pre-compiled lsquic docker image

Browse source 
from https://quay.io/repository/invidious/lsquic-compiled
fixes #2325
This commit is contained in:
Emilien Devos 2021-08-24 23:12:19 +02:00
parent fceb8093f1
commit d78e5281fe
2 changed files with 2 additions and 64 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
docker/Dockerfile
View file

@ -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 FROM crystallang/crystal:1.1.1-alpine AS builder
RUN apk add --no-cache sqlite-static yaml-static RUN apk add --no-cache sqlite-static yaml-static
@ -37,7 +6,7 @@ COPY ./shard.yml ./shard.yml
COPY ./shard.lock ./shard.lock COPY ./shard.lock ./shard.lock
RUN shards install 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/ COPY ./src/ ./src/
# TODO: .git folder is required for building – this is destructive. # TODO: .git folder is required for building – this is destructive.

33
docker/Dockerfile.arm64
View file

@ -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 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 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 COPY ./shard.lock ./shard.lock
RUN shards install 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/ COPY ./src/ ./src/
# TODO: .git folder is required for building – this is destructive. # TODO: .git folder is required for building – this is destructive.