From 069e91d2a609b1df94bdfbb693335969b2a281d8 Mon Sep 17 00:00:00 2001 From: xbdm Date: Tue, 10 Oct 2023 15:12:21 -0400 Subject: [PATCH] alpine v3.18 & Update Helm release postgresql (#4103) Co-authored-by: Samantaz Fox Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- docker/Dockerfile | 9 ++++----- docker/Dockerfile.arm64 | 6 +++--- kubernetes/Chart.lock | 6 +++--- kubernetes/Chart.yaml | 2 +- 4 files changed, 11 insertions(+), 12 deletions(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index 761bbdca0..c9644ca65 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,4 +1,5 @@ -FROM crystallang/crystal:1.4.1-alpine AS builder +FROM crystallang/crystal:1.8.2-alpine AS builder + RUN apk add --no-cache sqlite-static yaml-static ARG release @@ -19,8 +20,7 @@ COPY ./assets/ ./assets/ COPY ./videojs-dependencies.yml ./videojs-dependencies.yml RUN crystal spec --warnings all \ - --link-flags "-lxml2 -llzma" - + --link-flags "-lxml2 -llzma" RUN if [[ "${release}" == 1 ]] ; then \ crystal build ./src/invidious.cr \ --release \ @@ -32,8 +32,7 @@ RUN if [[ "${release}" == 1 ]] ; then \ --link-flags "-lxml2 -llzma"; \ fi - -FROM alpine:3.16 +FROM alpine:3.18 RUN apk add --no-cache librsvg ttf-opensans tini WORKDIR /invidious RUN addgroup -g 1000 -S invidious && \ diff --git a/docker/Dockerfile.arm64 b/docker/Dockerfile.arm64 index cf9231fbc..d9a4eeaff 100644 --- a/docker/Dockerfile.arm64 +++ b/docker/Dockerfile.arm64 @@ -1,5 +1,5 @@ -FROM alpine:3.16 AS builder -RUN apk add --no-cache 'crystal=1.4.1-r0' shards sqlite-static yaml-static yaml-dev libxml2-dev zlib-static openssl-libs-static openssl-dev musl-dev +FROM alpine:3.18 AS builder +RUN apk add --no-cache 'crystal=1.8.2-r0' shards sqlite-static yaml-static yaml-dev libxml2-static zlib-static openssl-libs-static openssl-dev musl-dev xz-static ARG release @@ -32,7 +32,7 @@ RUN if [[ "${release}" == 1 ]] ; then \ --link-flags "-lxml2 -llzma"; \ fi -FROM alpine:3.16 +FROM alpine:3.18 RUN apk add --no-cache librsvg ttf-opensans tini WORKDIR /invidious RUN addgroup -g 1000 -S invidious && \ diff --git a/kubernetes/Chart.lock b/kubernetes/Chart.lock index cc76e920f..ef12b0b62 100644 --- a/kubernetes/Chart.lock +++ b/kubernetes/Chart.lock @@ -1,6 +1,6 @@ dependencies: - name: postgresql repository: https://charts.bitnami.com/bitnami/ - version: 12.1.9 -digest: sha256:71ff342a6c0a98bece3d7fe199983afb2113f8db65a3e3819de875af2c45add7 -generated: "2023-01-20T20:42:32.757707004Z" + version: 12.11.1 +digest: sha256:3c10008175c4f5c1cec38782f5a7316154b89074c77ebbd9bcc4be4f5ff21122 +generated: "2023-09-14T22:40:43.171275362Z" diff --git a/kubernetes/Chart.yaml b/kubernetes/Chart.yaml index 4e4295ba6..d22f62545 100644 --- a/kubernetes/Chart.yaml +++ b/kubernetes/Chart.yaml @@ -17,6 +17,6 @@ maintainers: email: mail@leonklingele.de dependencies: - name: postgresql - version: ~12.1.6 + version: ~12.11.0 repository: "https://charts.bitnami.com/bitnami/" engine: gotpl