From bd6bfce1c33806307aed7fe45b96dd87bef5a096 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89milien=20=28perso=29?= <4016501+unixfox@users.noreply.github.com> Date: Sun, 21 Apr 2024 21:36:03 +0200 Subject: [PATCH] update crystal version + shards lib (#48) --- .github/workflows/ci.yml | 4 ++-- Dockerfile | 6 +++--- shard.lock | 11 +++-------- shard.yml | 7 ++++--- 4 files changed, 12 insertions(+), 16 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index aaa6717..e0a6971 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -16,9 +16,9 @@ jobs: - uses: actions/checkout@v2 - name: Install Crystal - uses: oprypin/install-crystal@v1 + uses: crystal-lang/install-crystal@v1.8.1 with: - crystal: 1.0.0 + crystal: 1.10.1 - name: Cache Shards uses: actions/cache@v2 diff --git a/Dockerfile b/Dockerfile index 2b3b239..2b4b554 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,12 +1,12 @@ -FROM docker.io/crystallang/crystal:1.0.0-alpine AS builder +FROM crystallang/crystal:1.10.1-alpine AS builder WORKDIR /app COPY ./shard.yml ./shard.yml RUN shards install COPY ./src/ ./src/ RUN crystal build ./src/instances.cr --release -FROM alpine:latest -RUN apk add --no-cache gc pcre libgcc +FROM alpine:3.18 +RUN apk add --no-cache gc pcre2 libgcc WORKDIR /app RUN addgroup -g 1000 -S invidious && \ adduser -u 1000 -S invidious -G invidious diff --git a/shard.lock b/shard.lock index c4cb889..104712e 100644 --- a/shard.lock +++ b/shard.lock @@ -2,21 +2,16 @@ version: 2.0 shards: backtracer: git: https://github.com/sija/backtracer.cr.git - version: 1.2.1 + version: 1.2.2 exception_page: git: https://github.com/crystal-loot/exception_page.git - version: 0.2.0 + version: 0.3.1 kemal: git: https://github.com/kemalcr/kemal.git - version: 1.0.0+git.commit.218be2422172d330feb62c6a8abc7df5402fdb84 - - kilt: - git: https://github.com/jeromegn/kilt.git - version: 0.6.1 + version: 1.4.0 radix: git: https://github.com/luislavena/radix.git version: 0.4.1 - diff --git a/shard.yml b/shard.yml index 7599b58..ee5cab2 100644 --- a/shard.yml +++ b/shard.yml @@ -1,8 +1,9 @@ name: instances -version: 0.1.0 +version: 0.2.0 authors: - Omar Roth + - Invidious team targets: instances: @@ -11,8 +12,8 @@ targets: dependencies: kemal: github: kemalcr/kemal - branch: master + version: ~> 1.4.0 -crystal: 1.0.0 +crystal: 1.10.1 license: AGPLv3