From 44167ab84ce64323d1584e87b52176de7da36781 Mon Sep 17 00:00:00 2001
From: MeiMei <30769358+mei23@users.noreply.github.com>
Date: Fri, 5 Mar 2021 14:46:58 +0900
Subject: [PATCH] Use alpine3.13 on Docker (#7249)

---
 .node-version |  2 +-
 Dockerfile    | 14 ++++++++------
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/.node-version b/.node-version
index 9a0c3d3f45..ab155ce138 100644
--- a/.node-version
+++ b/.node-version
@@ -1 +1 @@
-v14.15.4
+v14.15.5
diff --git a/Dockerfile b/Dockerfile
index eba3a833bc..c1745fc215 100644
--- a/Dockerfile
+++ b/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