From adc2e1ba98805b193b1aa6790cf29cd9ef4dc049 Mon Sep 17 00:00:00 2001
From: Nathan Byrd <techy1@gmail.com>
Date: Sat, 26 Aug 2023 10:37:12 -0500
Subject: [PATCH 1/4] Fixed Dockerfile to run on Windows

---
 docker/Dockerfile | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docker/Dockerfile b/docker/Dockerfile
index b53c72df..82815691 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -21,6 +21,7 @@ RUN apt-get update \
     lhasa \
     unrar-free \
     p7zip-full \
+    dos2unix \
     && npm install -g pm2 \
     && cd /enigma-bbs && npm install --only=production \
     && pm2 start main.js \
@@ -37,6 +38,7 @@ RUN apt-get update \
 
 # sexyz
 COPY docker/bin/sexyz /usr/local/bin
+RUN dos2unix /enigma-bbs/docker/bin/docker-entrypoint.sh && apt-get remove dos2unix -y
 RUN chmod +x /enigma-bbs/docker/bin/docker-entrypoint.sh
 
 # enigma storage mounts

From 1d00482b0283f3e9293f13506b01e7a3610da361 Mon Sep 17 00:00:00 2001
From: Nathan Byrd <techy1@gmail.com>
Date: Sat, 26 Aug 2023 10:54:39 -0500
Subject: [PATCH 2/4] Updated node & added .dockerignore

---
 .dockerignore     | 3 +++
 docker/Dockerfile | 5 +++--
 2 files changed, 6 insertions(+), 2 deletions(-)
 create mode 100644 .dockerignore

diff --git a/.dockerignore b/.dockerignore
new file mode 100644
index 00000000..960be9a0
--- /dev/null
+++ b/.dockerignore
@@ -0,0 +1,3 @@
+node_modules
+package-lock.json
+yarn.lock
\ No newline at end of file
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 82815691..c09b7a5c 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -1,4 +1,4 @@
-FROM node:14-buster-slim
+FROM node:18-buster-slim
 
 LABEL maintainer="dave@force9.org"
 
@@ -22,8 +22,9 @@ RUN apt-get update \
     unrar-free \
     p7zip-full \
     dos2unix \
+    && npm install -g npm@latest \
     && npm install -g pm2 \
-    && cd /enigma-bbs && npm install --only=production \
+    && cd /enigma-bbs && npm install \
     && pm2 start main.js \
     && mkdir -p /enigma-bbs-pre/art \
     && mkdir /enigma-bbs-pre/mods \

From 80dcc14a50a6cea293214b48af8337207ce470a5 Mon Sep 17 00:00:00 2001
From: Nathan Byrd <techy1@gmail.com>
Date: Sat, 26 Aug 2023 11:05:39 -0500
Subject: [PATCH 3/4] Small doc change to add running custom container

---
 docs/_docs/installation/docker.md | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/docs/_docs/installation/docker.md b/docs/_docs/installation/docker.md
index a6959b81..f2f7affa 100644
--- a/docs/_docs/installation/docker.md
+++ b/docs/_docs/installation/docker.md
@@ -71,5 +71,9 @@ Customising the Docker image is easy!
 1. Clone the ENiGMA-BBS source.
 2. Build the image
 ```bash
-docker build -f ./docker/Dockerfile .
+docker build -t enigmabbs -f ./docker/Dockerfile .
+```
+3. Run the image
+```bash
+docker run -it -p 8888:8888 --name "ENiGMABBS" -v "$(pwd)/config:/enigma-bbs/config" -v "$(pwd)/db:/enigma-bbs/db" -v "$(pwd)/logs:/enigma-bbs/logs" -v "$(pwd)/filebase:/enigma-bbs/filebase" -v "$(pwd)/art:/enigma-bbs/art" -v "$(pwd)/mods:/enigma-bbs/mods" -v "$(pwd)/mail:/mail" enigmabbs
 ```

From 13ae7789a5f857011c2480ec1ae06f0051353e1d Mon Sep 17 00:00:00 2001
From: Nathan Byrd <techy1@gmail.com>
Date: Sat, 26 Aug 2023 20:03:48 -0500
Subject: [PATCH 4/4] No need to copy the ephemeral directories

---
 .dockerignore | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/.dockerignore b/.dockerignore
index 960be9a0..749db005 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -1,3 +1,12 @@
 node_modules
 package-lock.json
-yarn.lock
\ No newline at end of file
+yarn.lock
+
+filebase
+db
+drop
+file_base
+logs
+mail
+docs/_site
+docs/.sass-cache
\ No newline at end of file