admin/dragonsstash
1
0
Fork 0
mirror of https://github.com/xCyanGrizzly/DragonsStash.git synced 2026-05-11 06:11:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3 from xCyanGrizzly/copilot/fix-redeploy-error

Browse Source 
fix: eliminate Google Fonts CDN dependency from Docker builds
This commit is contained in:
xCyanGrizzly
2026-03-04 14:55:27 +01:00
committed by GitHub
parent 30fe7d6855 48829e2efc
commit 81d322a91c
4 changed files with 16 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
docker-entrypoint.sh
View File

@@ -10,11 +10,11 @@ if [ "$AUTH_SECRET" = "change-me-to-a-random-secret-in-production" ] || [ -z "$A
fi fi
echo "Running database migrations..." echo "Running database migrations..."
npx prisma migrate deploy ./node_modules/.bin/prisma migrate deploy
if [ "$SEED_DATABASE" = "true" ]; then if [ "$SEED_DATABASE" = "true" ]; then
echo "Seeding database..." echo "Seeding database..."
npx prisma db seed || echo "Seeding skipped or already done." ./node_modules/.bin/prisma db seed || echo "Seeding skipped or already done."
fi fi
echo "Starting application..." echo "Starting application..."

10
package-lock.json generated
View File

@@ -19,6 +19,7 @@
"clsx": "^2.1.1", "clsx": "^2.1.1",
"cmdk": "^1.1.1", "cmdk": "^1.1.1",
"dotenv": "^17.3.1", "dotenv": "^17.3.1",
"geist": "^1.7.0",
"lucide-react": "^0.574.0", "lucide-react": "^0.574.0",
"next": "16.1.6", "next": "16.1.6",
"next-auth": "^5.0.0-beta.30", "next-auth": "^5.0.0-beta.30",
@@ -8100,6 +8101,15 @@
"dev": true, "dev": true,
"license": "BSD-3-Clause" "license": "BSD-3-Clause"
}, },
"node_modules/geist": {
"version": "1.7.0",
"resolved": "https://registry.npmjs.org/geist/-/geist-1.7.0.tgz",
"integrity": "sha512-ZaoiZwkSf0DwwB1ncdLKp+ggAldqxl5L1+SXaNIBGkPAqcu+xjVJLxlf3/S8vLt9UHx1xu5fz3lbzKCj5iOVdQ==",
"license": "SIL OPEN FONT LICENSE",
"peerDependencies": {
"next": ">=13.2.0"
}
},
"node_modules/generate-function": { "node_modules/generate-function": {
"version": "2.3.1", "version": "2.3.1",
"resolved": "https://registry.npmjs.org/generate-function/-/generate-function-2.3.1.tgz", "resolved": "https://registry.npmjs.org/generate-function/-/generate-function-2.3.1.tgz",

1
package.json
View File

@@ -28,6 +28,7 @@
"clsx": "^2.1.1", "clsx": "^2.1.1",
"cmdk": "^1.1.1", "cmdk": "^1.1.1",
"dotenv": "^17.3.1", "dotenv": "^17.3.1",
"geist": "^1.7.0",
"lucide-react": "^0.574.0", "lucide-react": "^0.574.0",
"next": "16.1.6", "next": "16.1.6",
"next-auth": "^5.0.0-beta.30", "next-auth": "^5.0.0-beta.30",

15
src/app/layout.tsx
View File

@@ -1,5 +1,6 @@
import type { Metadata } from "next"; import type { Metadata } from "next";
import { Geist, Geist_Mono } from "next/font/google"; import { GeistSans } from "geist/font/sans";
import { GeistMono } from "geist/font/mono";
import { SessionProvider } from "@/components/providers/session-provider"; import { SessionProvider } from "@/components/providers/session-provider";
import { ThemeProvider } from "@/components/providers/theme-provider"; import { ThemeProvider } from "@/components/providers/theme-provider";
import { Toaster } from "@/components/ui/sonner"; import { Toaster } from "@/components/ui/sonner";
@@ -7,16 +8,6 @@ import { TooltipProvider } from "@/components/ui/tooltip";
import { APP_NAME } from "@/lib/constants"; import { APP_NAME } from "@/lib/constants";
import "./globals.css"; import "./globals.css";
const geistSans = Geist({
variable: "--font-geist-sans",
subsets: ["latin"],
});
const geistMono = Geist_Mono({
variable: "--font-geist-mono",
subsets: ["latin"],
});
export const metadata: Metadata = { export const metadata: Metadata = {
title: { title: {
default: APP_NAME, default: APP_NAME,
@@ -29,7 +20,7 @@ export const metadata: Metadata = {
export default function RootLayout({ children }: { children: React.ReactNode }) { export default function RootLayout({ children }: { children: React.ReactNode }) {
return ( return (
<html lang="en" className="dark" suppressHydrationWarning> <html lang="en" className="dark" suppressHydrationWarning>
<body className={`${geistSans.variable} ${geistMono.variable} font-sans antialiased`}> <body className={`${GeistSans.variable} ${GeistMono.variable} font-sans antialiased`}>
<SessionProvider> <SessionProvider>
<ThemeProvider> <ThemeProvider>
<TooltipProvider delayDuration={0}> <TooltipProvider delayDuration={0}>