From ee2eb3d45e90fd933a7ba91dca0d33691f85f13d Mon Sep 17 00:00:00 2001 From: thespad Date: Thu, 23 May 2024 14:26:46 +0100 Subject: [PATCH] Rebase to 3.20 --- Dockerfile | 3 ++- Dockerfile.aarch64 | 3 ++- README.md | 3 ++- readme-vars.yml | 3 ++- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index 6f08c71..f50d07e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 -FROM ghcr.io/linuxserver/baseimage-alpine-nginx:3.19 +FROM ghcr.io/linuxserver/baseimage-alpine-nginx:3.20 ARG BUILD_DATE ARG VERSION @@ -67,6 +67,7 @@ RUN \ rm -rf /app/www/node_modules && \ cd streaming && \ yarn workspaces focus --production @mastodon/streaming && \ + printf "Linuxserver.io version: ${VERSION}\nBuild-date: ${BUILD_DATE}" > /build_version && \ echo "**** cleanup ****" && \ yarn cache clean && \ apk del --purge \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index a5efec5..52829eb 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 -FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm64v8-3.19 +FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm64v8-3.20 ARG BUILD_DATE ARG VERSION @@ -69,6 +69,7 @@ RUN \ rm -rf /app/www/node_modules && \ cd streaming && \ yarn workspaces focus --production @mastodon/streaming && \ + printf "Linuxserver.io version: ${VERSION}\nBuild-date: ${BUILD_DATE}" > /build_version && \ echo "**** cleanup ****" && \ yarn cache clean && \ apk del --purge \ diff --git a/README.md b/README.md index 018af36..3d7b159 100644 --- a/README.md +++ b/README.md @@ -419,7 +419,8 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions -* **02.05.24:** - Rebase to Alpine 3.19, enable [Active Record Encryption](https://github.com/mastodon/mastodon/pull/29831/files) +* **23.05.24:** - Rebase to Alpine 3.20. +* **02.05.24:** - Rebase to Alpine 3.19, enable [Active Record Encryption](https://github.com/mastodon/mastodon/pull/29831/files). * **21.12.23:** - Rebase to Alpine 3.19. * **30.05.23:** - Rebase to Alpine 3.18. * **16.04.23:** - Rebase to alpine 3.17 with php8.1. diff --git a/readme-vars.yml b/readme-vars.yml index 5b7db4f..e7bd0e7 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -115,7 +115,8 @@ app_setup_block: | # changelog changelogs: - - { date: "02.05.24:", desc: "Rebase to Alpine 3.19, enable [Active Record Encryption](https://github.com/mastodon/mastodon/pull/29831/files)" } + - { date: "23.05.24:", desc: "Rebase to Alpine 3.20." } + - { date: "02.05.24:", desc: "Rebase to Alpine 3.19, enable [Active Record Encryption](https://github.com/mastodon/mastodon/pull/29831/files)." } - { date: "21.12.23:", desc: "Rebase to Alpine 3.19." } - { date: "30.05.23:", desc: "Rebase to Alpine 3.18." } - { date: "16.04.23:", desc: "Rebase to alpine 3.17 with php8.1." }