Merge pull request #35 from mrjvs/master

.github/workflows/docker.yml

@@ -0,0 +1,56 @@
+name: Build and Publish Docker Image
+
+on:
+  push:
+  pull_request:
+  workflow_dispatch:
+
+env:
+  REGISTRY: ghcr.io
+  IMAGE_NAME: ${{ github.repository }}
+
+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
+
+    permissions:
+      contents: read
+      packages: write
+
+    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 container registry
+        if: ${{ env.SHOULD_PUSH_IMAGE == 'true' }}
+        uses: docker/#-action@v3
+        with:
+          registry: ${{ env.REGISTRY }}
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Extract Docker metadata
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
+          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

Dockerfile

@@ -1,15 +1,46 @@
-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}
+RUN apk add --no-cache python3 py3-pip make gcc g++
 
-COPY . ./
+# * Installing production dependencies
+FROM base AS dependencies
 
-VOLUME [ "/app/config.json", "/app/db.json" ]
+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
 
-CMD ["sh", "entrypoint.sh"]
+
+# * 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 . .
+
+
+# * Running the final application
+FROM base AS final
+ARG app_dir
+
+ENV NODE_ENV=production
+USER node
+
+COPY package.json .
+
+COPY --from=build ${app_dir} ${app_dir}
+COPY --from=dependencies ${app_dir}/node_modules ${app_dir}/node_modules
+
+VOLUME ["./config.json", "./database.db"]
+
+CMD ["node", "./src/bot"]

config.example.json

@@ -2,6 +2,7 @@
   "bot_token": "BOT_TOKEN",
   "application_id": "BOT_APP_ID",
   "public_key": "BOT_PUBLIC_KEY",
+  "db_path": "database.db",
   "nlp": {
     "force_train": true,
     "manager": {

src/database.js

@@ -1,12 +1,18 @@
 const path = require('path');
+const fs = require('fs');
 const sqlite3 = require('sqlite3');
 const sqlite = require('sqlite');
+const { db_path } = require('../config.json');
 
 let database;
 
+const resolvedDbPath = db_path ?? path.join(__dirname, '../database.db');
+const dbFolder = path.dirname(resolvedDbPath);
+fs.mkdirSync(dbFolder, { recursive: true });
+
 async function connect() {
 	database = await sqlite.open({
-		filename: path.join(__dirname, '../database.db'),
+		filename: resolvedDbPath,
 		driver: sqlite3.Database
 	});