From 24d91692a5390a90c3b3f9aa0d9d642b63bafddf Mon Sep 17 00:00:00 2001
From: Chase Wright <mysticryuujin@protonmail.com>
Date: Tue, 27 Apr 2021 10:04:44 -0500
Subject: [PATCH 1/2] Fixes to Dockerfile

* Install NodeJS 14 - The current recommended version. The old script is depreciated.

* Run `useradd` instead of `adduser` - Removes some error messages.

* Switch from `pm2 start` script to `pm2-runtime` command. - This is the recommended way to run pm2 in docker. It also stops us from crashing when the app name changes and the log file is missing,
---
 Dockerfile | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index b2690e4..e5ff23a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -36,14 +36,14 @@ FROM debian
 
 RUN apt-get update &&\
     apt-get install -y curl git-core &&\
-    curl -sL https://deb.nodesource.com/setup | bash - &&\
+    curl -sL https://deb.nodesource.com/setup_14.x | bash - &&\
     apt-get update &&\
     apt-get install -y nodejs
 
 RUN apt-get update &&\
     apt-get install -y build-essential
 
-RUN adduser ethnetintel
+RUN useradd -m ethnetintel
 
 RUN cd /home/ethnetintel &&\
     git clone https://github.com/cubedro/eth-net-intelligence-api &&\
@@ -51,11 +51,10 @@ RUN cd /home/ethnetintel &&\
     npm install &&\
     npm install -g pm2
 
-RUN echo '#!/bin/bash\nset -e\n\ncd /home/ethnetintel/eth-net-intelligence-api\n/usr/bin/pm2 start ./app.json\ntail -f \
-    /home/ethnetintel/.pm2/logs/node-app-out-0.log' > /home/ethnetintel/startscript.sh
-
-RUN chmod +x /home/ethnetintel/startscript.sh &&\
-    chown -R ethnetintel. /home/ethnetintel
+RUN chown -R ethnetintel. /home/ethnetintel
 
 USER ethnetintel
-ENTRYPOINT ["/home/ethnetintel/startscript.sh"]
+
+WORKDIR /home/ethnetintel/eth-net-intelligence-api
+
+CMD [ "pm2-runtime", "app.json" ]

From d7c2fa670c635b5a8e434acec2252dc2b789fe81 Mon Sep 17 00:00:00 2001
From: Chase Wright <mysticryuujin@protonmail.com>
Date: Tue, 27 Apr 2021 10:17:27 -0500
Subject: [PATCH 2/2] Switch to Alpine

In an effort to more align with #3 goals I switched to node:14-alpine - but I'm not sure if modification of app.json to passing env variables to docker is more or less preferred so here's another option.
---
 Dockerfile | 25 ++++++++-----------------
 1 file changed, 8 insertions(+), 17 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index e5ff23a..ae5da55 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -32,29 +32,20 @@
 ## If you now want to deploy a new client version, just redo the second step.
 
 
-FROM debian
+FROM node:14-alpine
 
-RUN apt-get update &&\
-    apt-get install -y curl git-core &&\
-    curl -sL https://deb.nodesource.com/setup_14.x | bash - &&\
-    apt-get update &&\
-    apt-get install -y nodejs
+RUN apk update && apk add git ca-certificates
+RUN adduser -S ethnetintel
 
-RUN apt-get update &&\
-    apt-get install -y build-essential
+WORKDIR /home/ethnetintel/eth-net-intelligence-api
 
-RUN useradd -m ethnetintel
+ADD package.json .
+RUN npm install && npm install -g pm2
 
-RUN cd /home/ethnetintel &&\
-    git clone https://github.com/cubedro/eth-net-intelligence-api &&\
-    cd eth-net-intelligence-api &&\
-    npm install &&\
-    npm install -g pm2
+ADD . .
 
-RUN chown -R ethnetintel. /home/ethnetintel
+RUN chown -R ethnetintel. .
 
 USER ethnetintel
 
-WORKDIR /home/ethnetintel/eth-net-intelligence-api
-
 CMD [ "pm2-runtime", "app.json" ]