Add docker support

Move secrets to config.json
2024-06-01 22:30:39 +02:00 · 2024-06-01 22:07:11 +02:00
10 changed files with 214 additions and 14 deletions
--- a/.dockerignore
+++ b/.dockerignore
@ -0,0 +1,2 @@
+node_modules/
+dist/
--- a/.gitignore
+++ b/.gitignore
@ -16,6 +16,7 @@ pnpm-debug.log*
 # environment variables
 .env
 .env.production
+config.json

 # macOS-specific files
 .DS_Store
--- a/15
+++ b/15
@ -0,0 +1,15 @@
+FROM node:20.8.0 AS runtime
+
+WORKDIR /app
+
+COPY . .
+
+RUN npm install
+
+ENV HOST=0.0.0.0
+
+ENV PORT=4321
+
+EXPOSE 4321
+
+CMD node ./dist/server/entry.mjs
--- a/astro.config.mjs
+++ b/astro.config.mjs
@ -1,9 +1,13 @@
 import { defineConfig } from 'astro/config';
-
 import icon from "astro-icon";

+import node from "@astrojs/node";
+
 // https://astro.build/config
 export default defineConfig({
  output: "server",
-  integrations: [icon()]
+  integrations: [icon()],
+  adapter: node({
+    mode: "standalone"
+  })
 });
--- a/package-lock.json
+++ b/package-lock.json
@ -7,6 +7,7 @@
    "": {
      "version": "0.0.1",
      "dependencies": {
+        "@astrojs/node": "^8.2.5",
        "@iconify-json/mdi": "^1.1.64",
        "argon2": "^0.40.1",
        "astro": "^4.5.10",
@ -186,6 +187,18 @@
        "vfile": "^6.0.1"
      }
    },
+    "node_modules/@astrojs/node": {
+      "version": "8.2.5",
+      "resolved": "https://registry.npmjs.org/@astrojs/node/-/node-8.2.5.tgz",
+      "integrity": "sha512-IdVD4dBNyg+ScmCATZ0FM7vNLAHq0TSdiJ3LpR4jcWIUhpN1ps5Jg+9CfzMaLmCCe/SJUZejK5EnzqUJdnGYyg==",
+      "dependencies": {
+        "send": "^0.18.0",
+        "server-destroy": "^1.0.1"
+      },
+      "peerDependencies": {
+        "astro": "^4.2.0"
+      }
+    },
    "node_modules/@astrojs/prism": {
      "version": "3.0.0",
      "resolved": "https://registry.npmjs.org/@astrojs/prism/-/prism-3.0.0.tgz",
@ -3899,6 +3912,14 @@
        "node": ">=0.10.0"
      }
    },
+    "node_modules/depd": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz",
+      "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==",
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
    "node_modules/dequal": {
      "version": "2.0.3",
      "resolved": "https://registry.npmjs.org/dequal/-/dequal-2.0.3.tgz",
@ -3907,6 +3928,15 @@
        "node": ">=6"
      }
    },
+    "node_modules/destroy": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.2.0.tgz",
+      "integrity": "sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg==",
+      "engines": {
+        "node": ">= 0.8",
+        "npm": "1.2.8000 || >= 1.4.16"
+      }
+    },
    "node_modules/detect-libc": {
      "version": "2.0.2",
      "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-2.0.2.tgz",
@ -4051,6 +4081,11 @@
      "resolved": "https://registry.npmjs.org/eastasianwidth/-/eastasianwidth-0.2.0.tgz",
      "integrity": "sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA=="
    },
+    "node_modules/ee-first": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz",
+      "integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow=="
+    },
    "node_modules/electron-to-chromium": {
      "version": "1.4.718",
      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.718.tgz",
@ -4073,6 +4108,14 @@
      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-10.3.0.tgz",
      "integrity": "sha512-QpLs9D9v9kArv4lfDEgg1X/gN5XLnf/A6l9cs8SPZLRZR3ZkY9+kwIQTxm+fsSej5UMYGE8fdoaZVIBlqG0XTw=="
    },
+    "node_modules/encodeurl": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz",
+      "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==",
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
    "node_modules/end-of-stream": {
      "version": "1.4.4",
      "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz",
@ -4157,6 +4200,11 @@
        "node": ">=6"
      }
    },
+    "node_modules/escape-html": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz",
+      "integrity": "sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow=="
+    },
    "node_modules/escape-string-regexp": {
      "version": "1.0.5",
      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
@ -4185,6 +4233,14 @@
        "@types/estree": "^1.0.0"
      }
    },
+    "node_modules/etag": {
+      "version": "1.8.1",
+      "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz",
+      "integrity": "sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg==",
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
    "node_modules/eventemitter3": {
      "version": "5.0.1",
      "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-5.0.1.tgz",
@ -4390,6 +4446,14 @@
        "node": ">=8"
      }
    },
+    "node_modules/fresh": {
+      "version": "0.5.2",
+      "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz",
+      "integrity": "sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q==",
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
    "node_modules/fs-constants": {
      "version": "1.0.0",
      "resolved": "https://registry.npmjs.org/fs-constants/-/fs-constants-1.0.0.tgz",
@ -4812,6 +4876,21 @@
      "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.1.1.tgz",
      "integrity": "sha512-er295DKPVsV82j5kw1Gjt+ADA/XYHsajl82cGNQG2eyoPkvgUhX+nDIyelzhIWbbsXP39EHcI6l5tYs2FYqYXQ=="
    },
+    "node_modules/http-errors": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-2.0.0.tgz",
+      "integrity": "sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ==",
+      "dependencies": {
+        "depd": "2.0.0",
+        "inherits": "2.0.4",
+        "setprototypeof": "1.2.0",
+        "statuses": "2.0.1",
+        "toidentifier": "1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
    "node_modules/human-signals": {
      "version": "5.0.0",
      "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-5.0.0.tgz",
@ -8337,6 +8416,17 @@
        "url": "https://github.com/fb55/nth-check?sponsor=1"
      }
    },
+    "node_modules/on-finished": {
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz",
+      "integrity": "sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==",
+      "dependencies": {
+        "ee-first": "1.1.1"
+      },
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
    "node_modules/once": {
      "version": "1.4.0",
      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
@ -8944,6 +9034,14 @@
      "integrity": "sha512-kJt5qhMxoszgU/62PLP1CJytzd2NKetjSRnyuj31fDd3Rlcz3fzlFdFLD1SItunPwyqEOkca6GbV612BWfaBag==",
      "optional": true
    },
+    "node_modules/range-parser": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz",
+      "integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==",
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
    "node_modules/rc": {
      "version": "1.2.8",
      "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz",
@ -9692,6 +9790,68 @@
      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
    },
+    "node_modules/send": {
+      "version": "0.18.0",
+      "resolved": "https://registry.npmjs.org/send/-/send-0.18.0.tgz",
+      "integrity": "sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg==",
+      "dependencies": {
+        "debug": "2.6.9",
+        "depd": "2.0.0",
+        "destroy": "1.2.0",
+        "encodeurl": "~1.0.2",
+        "escape-html": "~1.0.3",
+        "etag": "~1.8.1",
+        "fresh": "0.5.2",
+        "http-errors": "2.0.0",
+        "mime": "1.6.0",
+        "ms": "2.1.3",
+        "on-finished": "2.4.1",
+        "range-parser": "~1.2.1",
+        "statuses": "2.0.1"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/send/node_modules/debug": {
+      "version": "2.6.9",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+      "dependencies": {
+        "ms": "2.0.0"
+      }
+    },
+    "node_modules/send/node_modules/debug/node_modules/ms": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
+    },
+    "node_modules/send/node_modules/mime": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz",
+      "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==",
+      "bin": {
+        "mime": "cli.js"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/send/node_modules/ms": {
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
+      "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA=="
+    },
+    "node_modules/server-destroy": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/server-destroy/-/server-destroy-1.0.1.tgz",
+      "integrity": "sha512-rb+9B5YBIEzYcD6x2VKidaa+cqYBJQKnU4oe4E3ANwRRN56yk/ua1YCJT1n21NTS8w6CcOclAKNP3PhdCXKYtQ=="
+    },
+    "node_modules/setprototypeof": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz",
+      "integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw=="
+    },
    "node_modules/sharp": {
      "version": "0.32.6",
      "resolved": "https://registry.npmjs.org/sharp/-/sharp-0.32.6.tgz",
@ -9891,6 +10051,14 @@
        "node": ">=8"
      }
    },
+    "node_modules/statuses": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz",
+      "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==",
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
    "node_modules/stdin-discarder": {
      "version": "0.1.0",
      "resolved": "https://registry.npmjs.org/stdin-discarder/-/stdin-discarder-0.1.0.tgz",
@ -10180,6 +10348,14 @@
        "node": ">=8.0"
      }
    },
+    "node_modules/toidentifier": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz",
+      "integrity": "sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==",
+      "engines": {
+        "node": ">=0.6"
+      }
+    },
    "node_modules/trim-lines": {
      "version": "3.0.1",
      "resolved": "https://registry.npmjs.org/trim-lines/-/trim-lines-3.0.1.tgz",
--- a/package.json
+++ b/package.json
@ -11,6 +11,7 @@
    "test": "jest --detectOpenHandles --silent=false --verbose=true"
  },
  "dependencies": {
+    "@astrojs/node": "^8.2.5",
    "@iconify-json/mdi": "^1.1.64",
    "argon2": "^0.40.1",
    "astro": "^4.5.10",
--- a/src/lib/db/mongodb.ts
+++ b/src/lib/db/mongodb.ts
@ -1,12 +1,8 @@
 import { MongoClient } from "mongodb";
+import config from '../../../config.json'

-
-if(!process.env.MONGODB_URI || !process.env.MONGODB_DB) {
-    throw new Error("Please define MONGODB_URI and MONGODB_DB environment variables inside .env");
-}
-
-const uri = process.env.MONGODB_URI;
-const dbName = process.env.MONGODB_DB;
+const uri = config.MONGODB_URI;
+const dbName = config.MONGODB_DB;
 const options = {};

 const mongo = new MongoClient(uri, options);
--- a/src/pages/api/auth/generateAccessToken.ts
+++ b/src/pages/api/auth/generateAccessToken.ts
@ -3,6 +3,7 @@ import type { APIRoute } from "astro";
 import type AccessToken from "../../../types/AccessToken";
 import { createAccessToken } from "../../../lib/db/accessTokens";
 import { getUserByNickOrEmail } from "../../../lib/db/users";
+import config from '../../../../config.json';
 import type { ObjectId } from "mongodb";

 export const POST: APIRoute = async({ request }) => {
@ -33,7 +34,7 @@ export const POST: APIRoute = async({ request }) => {
        }), { status: 401 }
    )

-    if(token !== import.meta.env.MASTER_ACCESSTOKEN) return new Response(
+    if(token !== config.MASTER_ACCESSTOKEN) return new Response(
        JSON.stringify({
            code: 401,
            message: "Unauthorized",
--- a/src/pages/login.astro
+++ b/src/pages/login.astro
@ -4,6 +4,8 @@ import NavBar from '../components/NavBar.astro';

 import { getUserByNickOrEmail, updateLastLogin } from '../lib/db/users';

+import config from '../../config.json';
+
 import { verify } from 'argon2';

 let error = "";
@ -26,7 +28,7 @@ if(Astro.request.method === "POST") {
    const user = await getUserByNickOrEmail(username as string);

    if(user !== null && await verify(user.password, password as string)) {
-        const sessionTime = import.meta.env.SESSION_TIME_MINUTES * 60;
+        const sessionTime = config.SESSION_TIME_MINUTES * 60;

        const res = await fetch(`${Astro.url.origin}/api/auth/generateAccessToken`, {
            method: 'POST',
@ -37,7 +39,7 @@ if(Astro.request.method === "POST") {
            }),
            headers: {
                'Content-Type': 'application/json',
-                'Authorization': 'Bearer ' + import.meta.env.MASTER_ACCESSTOKEN
+                'Authorization': 'Bearer ' + config.MASTER_ACCESSTOKEN
            }
        });
        
--- a/src/pages/register.astro
+++ b/src/pages/register.astro
@ -4,6 +4,8 @@ import NavBar from '../components/NavBar.astro';

 import { createUser } from '../lib/db/users';

+import config from '../../config.json';
+
 let error = "";

 if(Astro.request.method === "POST") {
@ -56,7 +58,7 @@ if(Astro.request.method === "POST") {
    if(error === "") {
        const user = await createUser(username, email, password);

-        const sessionTime = import.meta.env.SESSION_TIME_MINUTES * 60;
+        const sessionTime = config.SESSION_TIME_MINUTES * 60;

        const res = await fetch(`${Astro.url.origin}/api/auth/generateAccessToken`, {
            method: 'POST',
@ -67,7 +69,7 @@ if(Astro.request.method === "POST") {
            }),
            headers: {
                'Content-Type': 'application/json',
-                'Authorization': 'Bearer ' + import.meta.env.MASTER_ACCESSTOKEN
+                'Authorization': 'Bearer ' + config.MASTER_ACCESSTOKEN
            }
        });
Author	SHA1	Message	Date
Aelita4	7ba6b02726	Add docker support	2024-06-01 22:30:39 +02:00
Aelita4	7b0bbf1c0f	Move secrets to config.json	2024-06-01 22:07:11 +02:00