From 851465da622ad098008f3730b30ab535e6149093 Mon Sep 17 00:00:00 2001
From: DynamoFox <magnacacuti@gmail.com>
Date: Fri, 2 Dec 2022 18:15:03 +0100
Subject: [PATCH] Fix missing webpack bundle generation in Docker container
 build

---
 Dockerfile | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 0b0e8f0d3..d563ef797 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -4,6 +4,9 @@ FROM node:16.18.0-alpine
 # Create app directory
 WORKDIR /usr/src/app
 
+# Bundle app source
+COPY . .
+
 COPY server-package.json package.json
 
 # Install app dependencies
@@ -18,20 +21,19 @@ RUN set -x \
         nasm \
         libpng-dev \
         python3 \
-    && npm install --production \
-    && apk del .build-dependencies
+    && npm install \
+    && apk del .build-dependencies \
+    && npm run webpack \
+    && npm prune --omit=dev \
+# Set the path to the newly created webpack bundle
+    && sed -i -e 's/app\/desktop.js/app-dist\/desktop.js/g' src/views/desktop.ejs \
+    && sed -i -e 's/app\/mobile.js/app-dist\/mobile.js/g' src/views/mobile.ejs \
+    && sed -i -e 's/app\/setup.js/app-dist\/setup.js/g' src/views/setup.ejs \
+    && sed -i -e 's/app\/share.js/app-dist\/share.js/g' src/views/share/*.ejs
 
 # Some setup tools need to be kept
 RUN apk add --no-cache su-exec shadow
 
-# Bundle app source
-COPY . .
-
-RUN sed -i -e 's/app\/desktop.js/app-dist\/desktop.js/g' src/views/desktop.ejs && \
-    sed -i -e 's/app\/mobile.js/app-dist\/mobile.js/g' src/views/mobile.ejs && \
-    sed -i -e 's/app\/setup.js/app-dist\/setup.js/g' src/views/setup.ejs && \
-    sed -i -e 's/app\/share.js/app-dist\/share.js/g' src/views/share/*.ejs
-
 # Add application user and setup proper volume permissions
 RUN adduser -s /bin/false node; exit 0