Merge branch 'develop'

.node-version

@@ -1 +1 @@
-v14.15.4
+v14.15.5

Dockerfile

@@ -1,4 +1,4 @@
-FROM node:14.15.4-alpine AS base
+FROM node:14.15.5-alpine3.13 AS base
 
 ENV NODE_ENV=production
 
@@ -10,7 +10,6 @@ RUN apk add --no-cache \
     autoconf \
     automake \
     file \
-		git \
     g++ \
     gcc \
     libc-dev \
@@ -18,8 +17,10 @@ RUN apk add --no-cache \
     make \
     nasm \
     pkgconfig \
-    python \
-    zlib-dev
+    python3 \
+    zlib-dev \
+    vips-dev \
+    vips
 
 COPY package.json yarn.lock ./
 RUN yarn install
@@ -30,8 +31,9 @@ FROM base AS runner
 
 RUN apk add --no-cache \
     ffmpeg \
-    tini
-RUN npm i -g web-push
+    tini \
+    vips
+
 ENTRYPOINT ["/sbin/tini", "--"]
 
 COPY --from=builder /misskey/node_modules ./node_modules