From 017e2bd734e4638c52a225e89c7ce7c8103097f1 Mon Sep 17 00:00:00 2001 From: Fijxu Date: Fri, 30 Jan 2026 22:17:38 -0300 Subject: [PATCH] Use custom docker image with already compiled OpenSSL crystal image --- docker/Dockerfile | 28 +--------------------------- 1 file changed, 1 insertion(+), 27 deletions(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index cc5efa01..587888b7 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,29 +1,8 @@ -# https://github.com/openssl/openssl/releases/tag/openssl-3.5.2 -ARG OPENSSL_VERSION='3.5.2' -ARG OPENSSL_SHA256='c53a47e5e441c930c3928cf7bf6fb00e5d129b630e0aa873b08258656e7345ec' - -FROM mirror.gcr.io/84codes/crystal:1.16.3-alpine AS dependabot-crystal - -# We compile openssl ourselves due to a memory leak in how crystal interacts -# with openssl -# Reference: https://github.com/iv-org/invidious/issues/1438#issuecomment-3087636228 -FROM dependabot-crystal AS openssl-builder -RUN apk add --no-cache curl perl linux-headers - -WORKDIR / - -ARG OPENSSL_VERSION -ARG OPENSSL_SHA256 -RUN curl -Ls "https://github.com/openssl/openssl/releases/download/openssl-${OPENSSL_VERSION}/openssl-${OPENSSL_VERSION}.tar.gz" --output openssl-${OPENSSL_VERSION}.tar.gz -RUN echo "${OPENSSL_SHA256} openssl-${OPENSSL_VERSION}.tar.gz" | sha256sum -c -RUN tar -xzvf openssl-${OPENSSL_VERSION}.tar.gz - -RUN cd openssl-${OPENSSL_VERSION} && ./Configure --openssldir=/etc/ssl && make -j$(nproc) +FROM git.nadeko.net/fijxu/84codes-crystal-openssl:1.16.3 AS dependabot-crystal FROM dependabot-crystal AS builder RUN apk add --no-cache sqlite-static yaml-static -RUN apk del openssl-dev openssl-libs-static ARG release @@ -47,17 +26,12 @@ COPY ./videojs-dependencies.yml ./videojs-dependencies.yml RUN crystal spec --warnings all \ --link-flags "-lxml2 -llzma" -ARG OPENSSL_VERSION -COPY --from=openssl-builder /openssl-${OPENSSL_VERSION} /openssl-${OPENSSL_VERSION} - RUN --mount=type=cache,target=/root/.cache/crystal if [[ "${release}" == 1 ]] ; then \ - PKG_CONFIG_PATH=/openssl-${OPENSSL_VERSION} \ crystal build ./src/invidious.cr \ --release -s -p -t --mcpu=x86-64-v2 \ --static --warnings all \ --link-flags "-lxml2 -llzma"; \ else \ - PKG_CONFIG_PATH=/openssl-${OPENSSL_VERSION} \ crystal build ./src/invidious.cr \ --static --warnings all \ --link-flags "-lxml2 -llzma"; \