From ae24360c027efc7eacfe5427f22b83c2df2815bf Mon Sep 17 00:00:00 2001 From: tleydxdy Date: Tue, 26 Nov 2019 18:20:23 -0500 Subject: [PATCH] Proper fix for docker build return to static linking --- docker/Dockerfile | 33 +++++++++++++++++++-------------- 1 file changed, 19 insertions(+), 14 deletions(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index 0defb92b..1bb4d11f 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,28 +1,32 @@ -FROM alpine:edge +FROM alpine:edge AS builder RUN apk add --no-cache crystal shards libc-dev \ - yaml-dev libxml2-dev sqlite-dev zlib-dev curl && \ - 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 update && \ - apk add boringssl-dev.apk lsquic.apk && \ - rm -rf /var/cache/apk/* boringssl-dev.apk lsquic.apk + yaml-dev libxml2-dev sqlite-dev zlib-dev openssl-dev \ + sqlite-static zlib-static openssl-libs-static WORKDIR /invidious COPY ./shard.yml ./shard.yml RUN shards update && shards install -RUN cp /usr/lib/libcrypto.a ./lib/lsquic/src/lsquic/ext/libcrypto.a && \ - cp /usr/lib/libssl.a ./lib/lsquic/src/lsquic/ext/libssl.a && \ - cp /usr/lib/liblsquic.a ./lib/lsquic/src/lsquic/ext/liblsquic.a +RUN apk add --no-cache curl && \ + 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 && \ + tar -xf boringssl-dev.apk && \ + tar -xf lsquic.apk +RUN mv ./usr/lib/libcrypto.a ./lib/lsquic/src/lsquic/ext/libcrypto.a && \ + mv ./usr/lib/libssl.a ./lib/lsquic/src/lsquic/ext/libssl.a && \ + mv ./usr/lib/liblsquic.a ./lib/lsquic/src/lsquic/ext/liblsquic.a COPY ./src/ ./src/ # TODO: .git folder is required for building – this is destructive. # See definition of CURRENT_BRANCH, CURRENT_COMMIT and CURRENT_VERSION. COPY ./.git/ ./.git/ -RUN crystal build --release --warnings all --error-on-warnings \ - # TODO: Remove next line, see https://github.com/crystal-lang/crystal/issues/7946 +RUN crystal build ./src/invidious.cr \ + --release --static --warnings all --error-on-warnings \ +# TODO: Remove next line, see https://github.com/crystal-lang/crystal/issues/7946 -Dmusl \ - ./src/invidious.cr + --link-flags "-lxml2 -llzma" +FROM alpine:latest RUN apk add --no-cache librsvg ttf-opensans +WORKDIR /invidious RUN addgroup -g 1000 -S invidious && \ adduser -u 1000 -S invidious -G invidious COPY ./assets/ ./assets/ @@ -30,5 +34,6 @@ COPY ./config/config.yml ./config/config.yml COPY ./config/sql/ ./config/sql/ COPY ./locales/ ./locales/ RUN sed -i 's/host: \(127.0.0.1\|localhost\)/host: postgres/' config/config.yml +COPY --from=builder /invidious/invidious . USER invidious CMD [ "/invidious/invidious" ]