mirror of
https://github.com/iv-org/invidious.git
synced 2026-04-28 01:07:07 -05:00
Merge cfb4165bdd4366fa5f45b85318f29d0a3fee87a7 into 264e7c24e96274941e7831178d372c81fabf1f0a
This commit is contained in:
commit
a87a64dc87
@ -2,7 +2,7 @@
|
|||||||
ARG OPENSSL_VERSION='3.5.2'
|
ARG OPENSSL_VERSION='3.5.2'
|
||||||
ARG OPENSSL_SHA256='c53a47e5e441c930c3928cf7bf6fb00e5d129b630e0aa873b08258656e7345ec'
|
ARG OPENSSL_SHA256='c53a47e5e441c930c3928cf7bf6fb00e5d129b630e0aa873b08258656e7345ec'
|
||||||
|
|
||||||
FROM crystallang/crystal:1.16.3-alpine AS dependabot-crystal
|
FROM crystallang/crystal:1.20.0-alpine AS dependabot-crystal
|
||||||
|
|
||||||
# We compile openssl ourselves due to a memory leak in how crystal interacts
|
# We compile openssl ourselves due to a memory leak in how crystal interacts
|
||||||
# with openssl
|
# with openssl
|
||||||
@ -43,7 +43,7 @@ COPY ./assets/ ./assets/
|
|||||||
COPY ./videojs-dependencies.yml ./videojs-dependencies.yml
|
COPY ./videojs-dependencies.yml ./videojs-dependencies.yml
|
||||||
|
|
||||||
RUN crystal spec --warnings all \
|
RUN crystal spec --warnings all \
|
||||||
--link-flags "-lxml2 -llzma"
|
--link-flags "-lxml2 -llzma"
|
||||||
|
|
||||||
ARG OPENSSL_VERSION
|
ARG OPENSSL_VERSION
|
||||||
COPY --from=openssl-builder /openssl-${OPENSSL_VERSION} /openssl-${OPENSSL_VERSION}
|
COPY --from=openssl-builder /openssl-${OPENSSL_VERSION} /openssl-${OPENSSL_VERSION}
|
||||||
|
|||||||
@ -2,7 +2,7 @@
|
|||||||
ARG OPENSSL_VERSION='3.5.2'
|
ARG OPENSSL_VERSION='3.5.2'
|
||||||
ARG OPENSSL_SHA256='c53a47e5e441c930c3928cf7bf6fb00e5d129b630e0aa873b08258656e7345ec'
|
ARG OPENSSL_SHA256='c53a47e5e441c930c3928cf7bf6fb00e5d129b630e0aa873b08258656e7345ec'
|
||||||
|
|
||||||
FROM alpine:3.22 AS dependabot-alpine
|
FROM alpine:edge AS dependabot-alpine
|
||||||
|
|
||||||
# We compile openssl ourselves due to a memory leak in how crystal interacts
|
# We compile openssl ourselves due to a memory leak in how crystal interacts
|
||||||
# with openssl
|
# with openssl
|
||||||
@ -21,7 +21,7 @@ RUN tar -xzvf openssl-${OPENSSL_VERSION}.tar.gz
|
|||||||
RUN cd openssl-${OPENSSL_VERSION} && ./Configure --openssldir=/etc/ssl && make -j$(nproc)
|
RUN cd openssl-${OPENSSL_VERSION} && ./Configure --openssldir=/etc/ssl && make -j$(nproc)
|
||||||
|
|
||||||
FROM dependabot-alpine AS builder
|
FROM dependabot-alpine AS builder
|
||||||
RUN apk add --no-cache 'crystal=1.16.3-r0' shards \
|
RUN apk add --no-cache 'crystal=1.20.0-r0' shards \
|
||||||
sqlite-static yaml-static yaml-dev \
|
sqlite-static yaml-static yaml-dev \
|
||||||
pcre2-static gc-static \
|
pcre2-static gc-static \
|
||||||
libxml2-static zlib-static \
|
libxml2-static zlib-static \
|
||||||
@ -63,7 +63,7 @@ RUN --mount=type=cache,target=/root/.cache/crystal if [[ "${release}" == 1 ]] ;
|
|||||||
--link-flags "-lxml2 -llzma"; \
|
--link-flags "-lxml2 -llzma"; \
|
||||||
fi
|
fi
|
||||||
|
|
||||||
FROM alpine:3.22
|
FROM alpine:3.23
|
||||||
RUN apk add --no-cache rsvg-convert ttf-opensans tini tzdata
|
RUN apk add --no-cache rsvg-convert ttf-opensans tini tzdata
|
||||||
WORKDIR /invidious
|
WORKDIR /invidious
|
||||||
RUN addgroup -g 1000 -S invidious && \
|
RUN addgroup -g 1000 -S invidious && \
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user