From 67a535b61340813fa5fc5a9bf4eca8b6e9a2ef33 Mon Sep 17 00:00:00 2001
From: tycrek <josh.moore@jmoore.dev>
Date: Wed, 13 Jul 2022 15:24:04 -0600
Subject: [PATCH] Removed step to upgrade NPM and install TS; improved rule
 ordering

---
 Dockerfile | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 1702929..c1b0ddd 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -12,12 +12,6 @@ WORKDIR /opt/ass/
 # Copy directory files (config.json, source files etc.)
 COPY . ./
 
-# Update npm to at least npm 8,
-# then install dependencies
-RUN npm i -g npm@8 typescript && \
-    npm i --save-dev && \
-    npm run build
-
 # Ensure these directories & files exist for compose volumes
 RUN mkdir -p /opt/ass/uploads/thumbnails/ && \
     mkdir -p /opt/ass/share/ && \
@@ -30,5 +24,9 @@ RUN mkdir -p /opt/ass/uploads/thumbnails/ && \
 # Set the user
 USER node
 
+# Install dependencies as rootless user
+RUN npm i --save-dev && \
+    npm run build
+
 # Start ass
 CMD npm start