3 files changed, 35 insertions, 8 deletions

diff --git a/.dockerignore b/.dockerignore
index 00a94efd2..8787a6a56 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -1,7 +1,11 @@
+.all-contributorsrc
+.devcontainer
 .dockerignore
+.editorconfig
 .husky/
 .stage
 .tmp
+.vscode
 **/.DS_Store
 **/.env
 **/.git*
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 7fcc868c2..c26de8a12 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -137,7 +137,7 @@ cd recipes && npm i && npm run package
 ### Using Docker to build a linux-targetted packaged app
 
 ```bash
-docker build -t ferdi-package .
+docker build -t ferdi-package-`uname -m` .
 ```
 
 The above will place all the built artifacts into the `/ferdi` folder within the image.
diff --git a/Dockerfile b/Dockerfile
index c94b42539..b6526460f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,24 +1,47 @@
-FROM electronuserland/builder:14 as builder
+# Note: Before running this file, you should have already cloned the git repo + submodules on the host machine. This is used when actively developing on your local machine, but you want to build for a different architecture
+
+FROM node:fermium-buster as builder
+
+# TODO: Need to setup a non-root user for security purposes
+
+ENV PATH="/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/snap/bin:/usr/local/lib:/usr/include:/usr/share"
+
+ARG DEBIAN_FRONTEND=noninteractive
+# Note: This is added for building on ARM machines
+ARG USE_SYSTEM_FPM="true"
+# Note: Added to bypass the error with missing git repo information for the 'preval-build-info' module
+ARG PREVAL_BUILD_INFO_PLACEHOLDERS=true
+
+RUN apt-get update \
+  && apt-get install -y rpm ruby gem \
+  && gem install fpm --no-ri --no-rdoc --no-document
 
 WORKDIR /usr/src/ferdi
 
 COPY package*.json ./
 COPY lerna.json ./
 
-# Note: This is being set to bypass the error with missing git repo information for the 'preval-build-info' module
-ENV PREVAL_BUILD_INFO_PLACEHOLDERS=true
-
 RUN npm i -g node-gyp@8.0.0 \
-    && npm config set node_gyp "$(which node-gyp)" \
-    && npx lerna bootstrap
+  && npm config set node_gyp "$(which node-gyp)"
 
 COPY . .
 
-RUN cd recipes && npm i && npm run package && cd ..
+# Note: Ideally this needs to be done before the COPY step - BUT moving this here resolves the issue with `preval-build-info-cli` not being found
+RUN npx lerna bootstrap
+
+RUN cd recipes \
+  && npm i \
+  && npm run package \
+  && cd ..
+
 RUN npm run build
 
+# --------------------------------------------------------------------------------------------
+
 FROM busybox
 
+# TODO: Need to setup a non-root user for security purposes
+
 WORKDIR /ferdi
 
 COPY --from=builder /usr/src/ferdi/out/* /ferdi/