From c8a8bd577847c1cb52a1a46db47831b0f0848282 Mon Sep 17 00:00:00 2001
From: Matthew Lopez <73856503+MatthewL246@users.noreply.github.com>
Date: Tue, 2 Jul 2024 15:07:50 -0400
Subject: [PATCH 1/3] chore: update Docker setup

---
 .dockerignore        | 10 +++----
 Dockerfile           | 62 +++++++++++++++++++++++++++++++++-----------
 docker/entrypoint.sh | 12 ---------
 3 files changed, 52 insertions(+), 32 deletions(-)
 delete mode 100644 docker/entrypoint.sh

diff --git a/.dockerignore b/.dockerignore
index b4bb16e..665b496 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -1,5 +1,5 @@
-node_modules
-.git
-config.json
-certs
-src/logs
+.git
+.env
+node_modules
+dist
+logs
diff --git a/Dockerfile b/Dockerfile
index be1b7af..53811ab 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,15 +1,47 @@
-FROM node:18-alpine
-
-RUN apk add --no-cache python3 make gcc g++ 
-WORKDIR /app
-
-COPY "docker/entrypoint.sh" ./
-
-COPY package*.json ./
-RUN npm install
-
-COPY . ./
-
-VOLUME [ "/app/config.json", "/app/certs" ]
-
-CMD ["sh", "entrypoint.sh"]
+# syntax=docker/dockerfile:1
+
+ARG app_dir="/home/node/app"
+
+
+# * Base Node.js image
+FROM node:20-alpine AS base
+ARG app_dir
+WORKDIR ${app_dir}
+
+
+# * Installing production dependencies
+FROM base AS dependencies
+
+RUN --mount=type=bind,source=package.json,target=package.json \
+	--mount=type=bind,source=package-lock.json,target=package-lock.json \
+	--mount=type=cache,target=/root/.npm \
+	npm ci --omit=dev
+
+
+# * Installing development dependencies and building the application
+FROM base AS build
+
+RUN --mount=type=bind,source=package.json,target=package.json \
+	--mount=type=bind,source=package-lock.json,target=package-lock.json \
+	--mount=type=cache,target=/root/.npm \
+	npm ci
+
+COPY . .
+RUN npm run build
+
+
+# * Running the final application
+FROM base AS final
+ARG app_dir
+
+RUN mkdir -p ${app_dir}/logs && chown node:node ${app_dir}/logs
+
+ENV NODE_ENV=production
+USER node
+
+COPY package.json .
+
+COPY --from=dependencies ${app_dir}/node_modules ${app_dir}/node_modules
+COPY --from=build ${app_dir}/dist ${app_dir}/dist
+
+CMD ["node", "."]
diff --git a/docker/entrypoint.sh b/docker/entrypoint.sh
deleted file mode 100644
index 8580413..0000000
--- a/docker/entrypoint.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/sh
-
-files='config.json certs/access/private.pem certs/access/aes.key'
-
-for file in $files; do
-    if [ ! -f $file ]; then
-        echo "$PWD/$file file does not exist. Please mount and try again."
-        exit 1
-    fi
-done
-
-exec node src/server.js

From 4374a5fedba45acec45d60dc704201ebc1ea9764 Mon Sep 17 00:00:00 2001
From: Matthew Lopez <73856503+MatthewL246@users.noreply.github.com>
Date: Tue, 2 Jul 2024 15:08:14 -0400
Subject: [PATCH 2/3] feat: create Docker build and publish action

---
 .github/workflows/docker.yml | 47 ++++++++++++++++++++++++++++++++++++
 1 file changed, 47 insertions(+)
 create mode 100644 .github/workflows/docker.yml

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
new file mode 100644
index 0000000..9e1ef9c
--- /dev/null
+++ b/.github/workflows/docker.yml
@@ -0,0 +1,47 @@
+name: Build and Publish Docker Image
+
+on:
+  push:
+  pull_request:
+  workflow_dispatch:
+
+jobs:
+  build-publish:
+    env:
+      SHOULD_PUSH_IMAGE: ${{ (github.event_name == 'push' && (github.ref == 'refs/heads/master' || github.ref == 'refs/heads/dev')) || github.event_name == 'workflow_dispatch' }}
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Set up QEMU for Docker
+        uses: docker/setup-qemu-action@v3
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Log into the Docker container registry
+        if: ${{ env.SHOULD_PUSH_IMAGE == 'true' }}
+        uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
+
+      - name: Extract Docker metadata
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          images: ${{ github.repository }}
+          tags: |
+            type=raw,value=latest,enable=${{ github.ref == 'refs/heads/master' }}
+            type=raw,value=edge,enable=${{ github.ref == 'refs/heads/dev' }}
+            type=sha
+
+      - name: Build and push Docker image
+        id: build-and-push
+        uses: docker/build-push-action@v6
+        with:
+          platforms: linux/amd64,linux/arm64
+          push: ${{ env.SHOULD_PUSH_IMAGE }}
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}
+          cache-from: type=gha
+          cache-to: type=gha,mode=max

From 73dab86fa588a3ca7b149f260e025c3bfda3da40 Mon Sep 17 00:00:00 2001
From: Matthew Lopez <73856503+MatthewL246@users.noreply.github.com>
Date: Tue, 2 Jul 2024 15:09:13 -0400
Subject: [PATCH 3/3] fix: exit server on SIGTERM

---
 src/server.ts | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/server.ts b/src/server.ts
index bc34398..46d42c7 100644
--- a/src/server.ts
+++ b/src/server.ts
@@ -1,4 +1,7 @@
 process.title = 'Pretendo - Miiverse';
+process.on('SIGTERM', () => {
+	process.exit(0);
+});
 
 import express from 'express';
 import morgan from 'morgan';
@@ -78,4 +81,4 @@ async function main(): Promise<void> {
 	});
 }
 
-main().catch(console.error);
\ No newline at end of file
+main().catch(console.error);