Merge branch 'main' of https://github.com/mirsella/hypertube into main

mirsella · Dec 14, 2024 · 86fcb8d · 86fcb8d
2 parents f5e3d6b + 82ddffb
commit 86fcb8d
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 9 deletions.
diff --git a/compose.yml b/compose.yml
@@ -14,14 +14,13 @@ services:
 
   nuxt:
     container_name: nuxt
-    stop_grace_period: 0s
     build:
       context: .
       dockerfile: nuxt.dockerfile
     env_file: .env
     restart: unless-stopped
     environment:
-      PGPASSWORD: "${PGPASSWORD}"
+      # PGPASSWORD: "${PGPASSWORD}" // the .env is loaded anyway
       PGHOST: postgres
       NUXT_APP_BASE_URL: ${NUXT_APP_BASE_URL}
     ports:
@@ -35,7 +34,7 @@ services:
     environment:
       - PUID=1000
       - PGID=1000
-      - TZ=Etc/UTC
+      - TZ=Etc/Paris
       - AUTO_UPDATE=true #optional
       - RUN_OPTS= #optional
     volumes:

diff --git a/nuxt.config.ts b/nuxt.config.ts
@@ -1,5 +1,3 @@
-import fs from "fs";
-
 function get_from_env(field: string): string {
   const env = process.env[field];
   if (!env && process.env.NODE_ENV === "development") {
@@ -24,8 +22,27 @@ export default defineNuxtConfig({
     jackettApiKey: get_from_env("JACKETT_API_KEY"),
   },
   nitro: {
-    // we need https://github.com/unjs/nitro/pull/2570
-    experimental: { tasks: true, openAPI: true },
+    experimental: {
+      tasks: true,
+      openAPI: true,
+    },
+    openAPI: {
+      production: "prerender",
+      ui: {
+        scalar: {
+          servers: [
+            {
+              url: "http://localhost:3000",
+              description: "dev server server",
+            },
+            {
+              url: "https://mirsella.mooo.com/hypertube",
+              description: "Production server",
+            },
+          ],
+        },
+      },
+    },
     scheduledTasks: {
       "0 * * * *": ["remove_old_movies"],
     },

diff --git a/package.json b/package.json
@@ -32,12 +32,12 @@
     "@types/fluent-ffmpeg": "^2.1.27",
     "@types/pg": "^8.11.10",
     "@types/webtorrent": "^0.109.10",
+    "@vitejs/plugin-vue": "^5.1.4",
     "daisyui": "^4.12.14",
     "drizzle-kit": "^0.28.0",
-    "vue-tsc": "2.0.29",
     "typescript": "5.6.2",
     "vite": "^5.4.10",
-    "@vitejs/plugin-vue": "^5.1.4"
+    "vue-tsc": "2.0.29"
   },
   "trustedDependencies": [
     "@parcel/watcher",