Merge pull request #74 from MatthewL246/docker-updates

.dockerignore

@@ -1,5 +1,6 @@
 .git
+.env
 node_modules
-config.json
-certs
-src/logs
+dist
+logs
+uploads

.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

.gitignore

@@ -2,3 +2,4 @@ node_modules
 config.json
 certs
 src/logs
+uploads

Dockerfile

@@ -1,15 +1,52 @@
-FROM node:18-alpine
+# syntax=docker/dockerfile:1
 
-RUN apk add --no-cache python3 make gcc g++ 
-WORKDIR /app
+ARG app_dir="/home/node/app"
 
-COPY "docker/entrypoint.sh" ./
 
-COPY package*.json ./
-RUN npm install
+# * Base Node.js image
+FROM node:20-alpine AS base
+ARG app_dir
+WORKDIR ${app_dir}
 
-COPY . ./
 
-VOLUME [ "/app/config.json", "/app/certs" ]
+# * Installing production dependencies
+FROM base AS dependencies
 
-CMD ["sh", "entrypoint.sh"]
+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 . .
+# TODO: re-enable after TypeScript migration
+#RUN npm run build
+
+
+# * Running the final application
+FROM base AS final
+ARG app_dir
+
+RUN mkdir -p ${app_dir}/src/logs && chown node:node ${app_dir}/src/logs \
+    && mkdir -p ${app_dir}/uploads && chown node:node ${app_dir}/uploads
+
+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} ${app_dir}
+
+# TODO: change back after TypeScript migration
+#COPY --from=build ${app_dir}/dist ${app_dir}/dist
+
+CMD ["node", "."]

docker/entrypoint.sh

@@ -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

src/redisCache.js

@@ -5,7 +5,9 @@ const logger = require('./logger');
 const config = require('../config.json');
 const { host, port } = config.redis;
 
-const redisClient = redis.createClient({ host, port });
+const redisClient = redis.createClient({
+	url: `redis://${host}:${port}`
+});
 
 redisClient.on('error', (error) => {
 	logger.error(error);

src/server.js

@@ -1,6 +1,10 @@
 /* eslint-disable @typescript-eslint/explicit-function-return-type */
 /* eslint-disable @typescript-eslint/no-var-requires */
 process.title = 'Pretendo - Juxt-Web';
+process.on('SIGTERM', () => {
+	process.exit(0);
+});
+
 const express = require('express');
 const morgan = require('morgan');
 const cookieParser = require('cookie-parser');