about summary refs log tree commit diff
path: root/Dockerfile
diff options
context:
space:
mode:
authorClaire <claire.github-309c@sitedethib.com>2023-04-09 11:40:14 +0200
committerClaire <claire.github-309c@sitedethib.com>2023-04-09 11:45:08 +0200
commitce12934f5b1804cc144014d9d0a93fdd16d13bf1 (patch)
treee6cb0c166392c28b38d86abe8f27344ce1d7752f /Dockerfile
parentff168ef2024626f37fa776fde5739dcd58ecb9f2 (diff)
parent99e3e152cd2180cfa9a5bcafae208d44f31078f8 (diff)
Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `package.json`:
  Upstream removed a dependency that was textually close to a glitch-soc-only
  dependency.
  Removed the dependency as upstream did, while keeping the glitch-soc-only
  dependency.
Diffstat (limited to 'Dockerfile')
-rw-r--r--Dockerfile3
1 files changed, 1 insertions, 2 deletions
diff --git a/Dockerfile b/Dockerfile
index dca547c6d..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
@@ -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 \