Merge canvas-fix into master

2 files changed, 2 insertions, 1 deletions

diff --git a/Dockerfile b/Dockerfile

index 4e31aa37..b1b00a7a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -4,7 +4,7 @@ RUN apk add --no-cache make gcc g++ python cairo-dev jpeg-dev pango-dev giflib-d
 WORKDIR /usr/src/fosscord-api
 COPY package.json .
 COPY package-lock.json .
-RUN npm rebuild bcrypt --build-from-source && npm rebuild canvas --build-from-source
+RUN npm rebuild bcrypt --build-from-source && npm install canvas --build-from-source
 RUN npm install
 COPY . .
 EXPOSE 3001
diff --git a/package.json b/package.json

index b2de45ad..524a5477 100644
--- a/package.json
+++ b/package.json
@@ -41,6 +41,7 @@
 		"assert": "^1.5.0",
 		"atomically": "^1.7.0",
 		"bcrypt": "^5.0.1",
+		"canvas": "^2.8.0",
 		"body-parser": "^1.19.0",
 		"cheerio": "^1.0.0-rc.9",
 		"dot-prop": "^6.0.1",