From 26682d4c22cc47901bf0dd43c6b26e896d4a9c7e Mon Sep 17 00:00:00 2001
From: Nick Schonning <nschonni@gmail.com>
Date: Fri, 7 Apr 2023 08:10:12 -0400
Subject: Remove duplicate ca-certificates Docker install (#24231)

---
 Dockerfile | 1 -
 1 file changed, 1 deletion(-)

(limited to 'Dockerfile')

diff --git a/Dockerfile b/Dockerfile
index dca547c6d..33137fca8 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -18,7 +18,6 @@ COPY Gemfile* package.json yarn.lock /opt/mastodon/
 # hadolint ignore=DL3008
 RUN apt-get update && \
     apt-get install -y --no-install-recommends build-essential \
-        ca-certificates \
         git \
         libicu-dev \
         libidn11-dev \
-- 
cgit 


From 862861069d413dbe9575b0d7f179e7907d30eb70 Mon Sep 17 00:00:00 2001
From: Nick Schonning <nschonni@gmail.com>
Date: Fri, 7 Apr 2023 08:26:11 -0400
Subject: Update Node.js to 16.20.0 (#24316)

---
 .nvmrc     | 2 +-
 Dockerfile | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'Dockerfile')

diff --git a/.nvmrc b/.nvmrc
index 030fcd56b..59ea99ee6 100644
--- a/.nvmrc
+++ b/.nvmrc
@@ -1 +1 @@
-16.19
+16.20
diff --git a/Dockerfile b/Dockerfile
index 33137fca8..978933421 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.19-bullseye-slim"
+ARG NODE_VERSION="16.20-bullseye-slim"
 
 FROM ghcr.io/moritzheiber/ruby-jemalloc:3.2.2-slim as ruby
 FROM node:${NODE_VERSION} as build
-- 
cgit