ci(docker): fix docker build

fix: buiild add docker env variables

fix: build

chore: package lock

chore: package lock

chore: package lock

chore: package lock

chore: package lock

chore: package lock

chore: package lock

chore: package lock

chore: package lock

chore: package lock

chore: package lock

chore: package lock

chore: package lock

chore: package lock

chore: package lock

chore: package lock

chore: package lock

chore: package lock

chore: package lock

chore: package lock

chore: package lock

chore: package lock

chore: package lock

ci(docker): fix docker build

.dockerignore

@@ -0,0 +1,7 @@
+Dockerfile
+.dockerignore
+node_modules
+npm-debug.log
+README.md
+.next
+.git

.github/workflows/deploy-server.yml

@@ -0,0 +1,25 @@
+name: Deploy
+
+on:
+  push:
+    branches: [main]
+
+jobs:
+  deploy:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-node@v2
+        with:
+          node-version: '18.18'
+      - uses: oven-sh/setup-bun@v1
+        with:
+          bun-version: latest
+      - name: Install caprover
+        run: sudo npm install -g caprover
+
+      - name: Create tar
+        run: tar -cvf ./deploy.tar --exclude='node_modules' --exclude='.git' --exclude='.next' *
+
+      - name: Deploy
+        run: caprover deploy -h ${{ secrets.CAPROVER_SERVER_PROD }} -p ${{ secrets.CAPROVER_PASSWORD_PROD }} -a riftmaker -t ./deploy.tar

.gitignore

@@ -36,4 +36,5 @@ yarn-error.log*
 next-env.d.ts
 
 
-.env
+.env
+deploy.tar

Dockerfile

@@ -0,0 +1,42 @@
+FROM oven/bun:latest
+WORKDIR /usr/src/app
+
+ARG THRESHOLD=${THRESHOLD}
+ENV THRESHOLD=${THRESHOLD}
+ARG NEXTAUTH_SECRET=${NEXTAUTH_SECRET}
+ENV NEXTAUTH_SECRET=${NEXTAUTH_SECRET}
+ARG NEXTAUTH_URL=${NEXTAUTH_URL}
+ENV NEXTAUTH_URL=${NEXTAUTH_URL}
+ARG DISCORD_CLIENT_ID=${DISCORD_CLIENT_ID}
+ENV DISCORD_CLIENT_ID=${DISCORD_CLIENT_ID}
+ARG DISCORD_CLIENT_SECRET=${DISCORD_CLIENT_SECRET}
+ENV DISCORD_CLIENT_SECRET=${DISCORD_CLIENT_SECRET}
+ARG TWITCH_CLIENT_ID=${TWITCH_CLIENT_ID}
+ENV TWITCH_CLIENT_ID=${TWITCH_CLIENT_ID}
+ARG TWITCH_CLIENT_SECRET=${TWITCH_CLIENT_SECRET}
+ENV TWITCH_CLIENT_SECRET=${TWITCH_CLIENT_SECRET}
+ARG DATABASE_URL=${DATABASE_URL}
+ENV DATABASE_URL=${DATABASE_URL}
+ARG NEXT_PUBLIC_BASE_URL=${NEXT_PUBLIC_BASE_URL}
+ENV NEXT_PUBLIC_BASE_URL=${NEXT_PUBLIC_BASE_URL}
+
+# Install nodejs using n
+RUN apt-get -y update; apt-get -y install curl
+ARG NODE_VERSION=18
+RUN curl -L https://raw.githubusercontent.com/tj/n/master/bin/n -o n \
+    && bash n $NODE_VERSION \
+    && rm n \
+    && npm install -g n
+
+COPY bun.lockb package.json prisma ./
+RUN bun install
+
+COPY . .
+RUN bunx prisma generate
+
+RUN bun run build
+ENV NODE_ENV production
+
+WORKDIR /usr/src/app/.next/standalone
+EXPOSE 3000
+ENTRYPOINT [ "node", "server.js" ]

README.md

@@ -5,15 +5,15 @@ This is a [Next.js](https://nextjs.org/) project bootstrapped with [`create-next
 First, run the development server:
 
 ```bash
-npm run dev
-# or
-yarn dev
-# or
-pnpm dev
-# or
 bun dev
 ```
 
+
+```bash
+ docker build -t riftmaker-web .
+```
+
+
 Open [http://localhost:3000](http://localhost:3000) with your browser to see the result.
 
 You can start editing the page by modifying `app/page.tsx`. The page auto-updates as you edit the file.

build.sh

@@ -0,0 +1,11 @@
+#!/bin/sh
+set -e
+
+# Run Next.js build with passed arguments
+next build "$@"
+
+# Copy files only if not in a CI environment
+if [ -z "$CI" ]; then
+  cp -r ./public ./.next/standalone/public
+  cp -r ./.next/static ./.next/standalone/.next/static
+fi

captain-definition

@@ -0,0 +1,4 @@
+ {
+  "schemaVersion": 2,
+  "dockerfilePath": "./Dockerfile"
+ }

env.mjs

@@ -9,7 +9,7 @@ export const env = createEnv({
     DISCORD_CLIENT_SECRET: z.string().min(1),
     TWITCH_CLIENT_ID: z.string().min(1),
     TWITCH_CLIENT_SECRET: z.string().min(1),
-    THRESHOLD: z.number().int().min(1).default(3),
+    THRESHOLD: z.coerce.number().int().min(1).default(3),
   },
   client: {
     NEXT_PUBLIC_BASE_URL: z.string().min(1),

next.config.mjs

@@ -1,4 +1,4 @@
-import './env.mjs';
+// import './env.mjs';
 
 /** @type {import('next').NextConfig} */
 const nextConfig = {
@@ -15,6 +15,7 @@ const nextConfig = {
     ],
   },
   reactStrictMode: false,
+  output: 'standalone',
 };
 
 export default nextConfig;

package.json

@@ -4,11 +4,11 @@
   "private": true,
   "scripts": {
     "dev": "next dev",
-    "build": "next build",
+    "postinstall": "prisma generate",
+    "build": "bash ./build.sh",
     "start": "next start",
     "lint": "next lint",
-    "test": "vitest",
-    "postinstall": "prisma generate"
+    "test": "vitest"
   },
   "dependencies": {
     "@auth/prisma-adapter": "^1.0.8",

prisma/schema.prisma

@@ -5,6 +5,7 @@ datasource db {
 
 generator client {
   provider = "prisma-client-js"
+  binaryTargets = ["native", "debian-openssl-1.1.x", "debian-openssl-3.0.x", "linux-musl","linux-musl-openssl-3.0.x"]
 }
 
 model Account {
@@ -43,8 +44,8 @@ model User {
   accounts      Account[]
   sessions      Session[]
 
-  isAdmin       Boolean   @default(false)
-  isBanned      Boolean   @default(false)
+  isAdmin  Boolean @default(false)
+  isBanned Boolean @default(false)
 
   riotId String?
   role   PlayerRole?
@@ -53,7 +54,7 @@ model User {
   teams       TeamPlayer[]
   tournaments Tournament[] @relation("TournamentParticipants")
 
-  createdTournaments Tournament[] @relation("TournamentCreator")
+  createdTournaments    Tournament[] @relation("TournamentCreator")
   kickedFromTournaments Tournament[] @relation("KickedPlayers")
 }