From 70841d2e175178117840e07377e14186dd32941d Mon Sep 17 00:00:00 2001 From: Effy Elden Date: Wed, 21 Dec 2022 09:49:24 +1100 Subject: [PATCH 1/6] Bump Docker to node:18.12.1-bullseye-slim to test performance --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index ce7f4d718..aab143cbd 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1.4 # This needs to be bullseye-slim because the Ruby image is built on bullseye-slim -ARG NODE_VERSION="16.18.1-bullseye-slim" +ARG NODE_VERSION="18.12.1-bullseye-slim" FROM ghcr.io/moritzheiber/ruby-jemalloc:3.0.4-slim as ruby FROM node:${NODE_VERSION} as build From 7fd0261887c3101adbdb0f46a795d72cada1ebe9 Mon Sep 17 00:00:00 2001 From: Effy Elden Date: Wed, 21 Dec 2022 09:59:57 +1100 Subject: [PATCH 2/6] Add openssl-legacy-provider option --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index aab143cbd..b683dbc4e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -91,7 +91,7 @@ USER mastodon WORKDIR /opt/mastodon # Precompile assets -RUN OTP_SECRET=precompile_placeholder SECRET_KEY_BASE=precompile_placeholder rails assets:precompile && \ +RUN OTP_SECRET=precompile_placeholder SECRET_KEY_BASE=precompile_placeholder NODE_OPTIONS=--openssl-legacy-provider rails assets:precompile && \ yarn cache clean # Set the work dir and the container entry point From dac312a11a481cab1d61a2159b39ca403d6708e8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 21 Dec 2022 11:22:22 +0900 Subject: [PATCH 3/6] Bump fog-core from 2.1.0 to 2.3.0 (#22544) Bumps [fog-core](https://github.com/fog/fog-core) from 2.1.0 to 2.3.0. - [Release notes](https://github.com/fog/fog-core/releases) - [Changelog](https://github.com/fog/fog-core/blob/master/changelog.md) - [Commits](https://github.com/fog/fog-core/compare/v2.1.0...v2.3.0) --- updated-dependencies: - dependency-name: fog-core dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- Gemfile.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 00e8dcfd9..eb262fd96 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -259,19 +259,19 @@ GEM ffi-compiler (1.0.1) ffi (>= 1.0.0) rake - fog-core (2.1.0) + fog-core (2.3.0) builder - excon (~> 0.58) - formatador (~> 0.2) + excon (~> 0.71) + formatador (>= 0.2, < 2.0) mime-types fog-json (1.2.0) fog-core multi_json (~> 1.10) - fog-openstack (0.3.10) - fog-core (>= 1.45, <= 2.1.0) + fog-openstack (0.3.2) + fog-core (~> 2.1) fog-json (>= 1.0) ipaddress (>= 0.8) - formatador (0.3.0) + formatador (1.1.0) fugit (1.7.1) et-orbi (~> 1, >= 1.2.7) raabro (~> 1.4) From a0af356df65f659e36b5b833e16011ff49cdc6f5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 21 Dec 2022 11:58:01 +0900 Subject: [PATCH 4/6] Bump fog-openstack from 0.3.2 to 0.3.10 (#22593) Bumps [fog-openstack](https://github.com/fog/fog-openstack) from 0.3.2 to 0.3.10. - [Release notes](https://github.com/fog/fog-openstack/releases) - [Changelog](https://github.com/fog/fog-openstack/blob/master/CHANGELOG.md) - [Commits](https://github.com/fog/fog-openstack/compare/v0.3.2...v0.3.10) --- updated-dependencies: - dependency-name: fog-openstack dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- Gemfile.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index eb262fd96..00e8dcfd9 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -259,19 +259,19 @@ GEM ffi-compiler (1.0.1) ffi (>= 1.0.0) rake - fog-core (2.3.0) + fog-core (2.1.0) builder - excon (~> 0.71) - formatador (>= 0.2, < 2.0) + excon (~> 0.58) + formatador (~> 0.2) mime-types fog-json (1.2.0) fog-core multi_json (~> 1.10) - fog-openstack (0.3.2) - fog-core (~> 2.1) + fog-openstack (0.3.10) + fog-core (>= 1.45, <= 2.1.0) fog-json (>= 1.0) ipaddress (>= 0.8) - formatador (1.1.0) + formatador (0.3.0) fugit (1.7.1) et-orbi (~> 1, >= 1.2.7) raabro (~> 1.4) From fbe2c95ff1a7b36fa0b73b8ff75a02590006eab1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 21 Dec 2022 12:06:44 +0900 Subject: [PATCH 5/6] Bump fog-core from 2.1.0 to 2.3.0 (#22596) Bumps [fog-core](https://github.com/fog/fog-core) from 2.1.0 to 2.3.0. - [Release notes](https://github.com/fog/fog-core/releases) - [Changelog](https://github.com/fog/fog-core/blob/master/changelog.md) - [Commits](https://github.com/fog/fog-core/compare/v2.1.0...v2.3.0) --- updated-dependencies: - dependency-name: fog-core dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- Gemfile.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 00e8dcfd9..eb262fd96 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -259,19 +259,19 @@ GEM ffi-compiler (1.0.1) ffi (>= 1.0.0) rake - fog-core (2.1.0) + fog-core (2.3.0) builder - excon (~> 0.58) - formatador (~> 0.2) + excon (~> 0.71) + formatador (>= 0.2, < 2.0) mime-types fog-json (1.2.0) fog-core multi_json (~> 1.10) - fog-openstack (0.3.10) - fog-core (>= 1.45, <= 2.1.0) + fog-openstack (0.3.2) + fog-core (~> 2.1) fog-json (>= 1.0) ipaddress (>= 0.8) - formatador (0.3.0) + formatador (1.1.0) fugit (1.7.1) et-orbi (~> 1, >= 1.2.7) raabro (~> 1.4) From c4a429ed47e85a6bbf0d470a41cc2f64cf120c19 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 21 Dec 2022 12:40:50 +0900 Subject: [PATCH 6/6] Bump fog-openstack from 0.3.2 to 0.3.10 (#22597) Bumps [fog-openstack](https://github.com/fog/fog-openstack) from 0.3.2 to 0.3.10. - [Release notes](https://github.com/fog/fog-openstack/releases) - [Changelog](https://github.com/fog/fog-openstack/blob/master/CHANGELOG.md) - [Commits](https://github.com/fog/fog-openstack/compare/v0.3.2...v0.3.10) --- updated-dependencies: - dependency-name: fog-openstack dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- Gemfile.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index eb262fd96..00e8dcfd9 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -259,19 +259,19 @@ GEM ffi-compiler (1.0.1) ffi (>= 1.0.0) rake - fog-core (2.3.0) + fog-core (2.1.0) builder - excon (~> 0.71) - formatador (>= 0.2, < 2.0) + excon (~> 0.58) + formatador (~> 0.2) mime-types fog-json (1.2.0) fog-core multi_json (~> 1.10) - fog-openstack (0.3.2) - fog-core (~> 2.1) + fog-openstack (0.3.10) + fog-core (>= 1.45, <= 2.1.0) fog-json (>= 1.0) ipaddress (>= 0.8) - formatador (1.1.0) + formatador (0.3.0) fugit (1.7.1) et-orbi (~> 1, >= 1.2.7) raabro (~> 1.4)