Merge pull request #13 from SkidGod4444/bugfix/docker

try to fix docker
SkidGod4444 · Nov 6, 2024 · 8c47947 · 8c47947
2 parents 41f7490 + 0225acc
commit 8c47947
Show file tree

Hide file tree

Showing 23 changed files with 610 additions and 11,969 deletions.
diff --git a/.dockerignore b/.dockerignore
@@ -1,2 +1,6 @@
 node_modules
-npm-debug.log
+pnpm-debug.log
+.git
+.gitignore
+*.md
+dist
diff --git a/.github/workflows/dependancy-update.yml b/.github/workflows/dependancy-update.yml
diff --git a/.github/workflows/lint-and-test.yml b/.github/workflows/lint-and-test.yml
@@ -9,6 +9,8 @@ on:
   pull_request:
     branches:
       - main
+      - 'feature/*'
+      - 'bugfix/*'
 
 jobs:
   lint:

diff --git a/.github/workflows/test-multiple-node-versions.yml b/.github/workflows/test-multiple-node-versions.yml
@@ -1,12 +1,16 @@
-name: CI
+name: Run Test on Multiple Node Versions
 
 on:
-    push:
-      branches:
-        - 'tpn/*'
-    pull_request:
-      branches:
-        - 'tpn/*'
+  push:
+    branches:
+      - main
+      - 'feature/*'
+      - 'bugfix/*'
+  pull_request:
+    branches:
+      - main
+      - 'feature/*'
+      - 'bugfix/*'
 
 jobs:
   test:

diff --git a/Dockerfile b/Dockerfile
diff --git a/apps/api/.gitignore b/apps/api/.gitignore
@@ -1,5 +1,8 @@
+# prod
+out/
+
 # dev
-.vercel/
+.next/
 .yarn/
 !.yarn/releases
 .vscode/*
@@ -27,5 +30,3 @@ lerna-debug.log*
 
 # misc
 .DS_Store
-
-.vercel
diff --git a/apps/api/Dockerfile b/apps/api/Dockerfile
@@ -0,0 +1,41 @@
+FROM namesmt/images-alpine:node-aws-dev_pnpm10.0.0-alpha.0 AS base
+
+RUN pnpm install -g turbo
+WORKDIR /usr/home/plura/api
+COPY package.json pnpm-lock.yaml ./
+RUN pnpm install --no-frozen-lockfile
+
+FROM base AS builder
+
+WORKDIR /usr/home/plura/api
+COPY package.json pnpm-lock.yaml ./
+RUN pnpm install --no-frozen-lockfile
+COPY . .
+ENV TURBO_REMOTE_CACHE=false
+RUN turbo prune api --docker
+
+FROM base AS installer
+
+WORKDIR /usr/home/plura/api
+
+COPY --from=builder /usr/home/plura/api/out/json/ .
+RUN pnpm install --no-frozen-lockfile
+COPY --from=builder /usr/home/plura/api/out/full/ .
+RUN pnpm run build
+RUN turbo build --filter=api...
+
+FROM base AS runner
+
+# RUN addgroup --system --gid 4444 honojs
+# RUN adduser --system --uid 4444 skidgod
+
+WORKDIR /usr/home/plura/api
+RUN pnpm install --no-frozen-lockfile
+# RUN chown -R skidgod:honojs /root/.local/share/pnpm
+
+# USER skidgod
+
+COPY --from=installer /usr/home/plura/api .
+
+# Start the application
+CMD ["pnpm", "start"]
diff --git a/apps/api/README.md b/apps/api/README.md
@@ -1,4 +1,4 @@
 ```
 npm install
-npm run start
+npm run dev
 ```
diff --git a/apps/api/api/index.ts b/apps/api/api/index.ts
diff --git a/apps/api/app/api/[...route]/route.ts b/apps/api/app/api/[...route]/route.ts
@@ -0,0 +1,14 @@
+import { Hono } from 'hono'
+import { handle } from 'hono/vercel'
+
+export const runtime = 'edge'
+
+const app = new Hono().basePath('/api')
+
+app.get('/hello', (c) => {
+  return c.json({
+    message: 'Hello from Hono!'
+  })
+})
+
+export const GET = handle(app)
diff --git a/apps/api/app/layout.tsx b/apps/api/app/layout.tsx
@@ -0,0 +1,18 @@
+import type { Metadata } from 'next'
+
+export const metadata: Metadata = {
+  title: 'Hono | nextjs',
+  description: 'Generated by hono'
+}
+
+export default function RootLayout({
+  children
+}: Readonly<{
+  children: React.ReactNode
+}>) {
+  return (
+    <html lang="en">
+      <body>{children}</body>
+    </html>
+  )
+}
diff --git a/apps/api/app/page.tsx b/apps/api/app/page.tsx
@@ -0,0 +1,19 @@
+'use client'
+import { useEffect, useState } from 'react'
+
+export default function Home() {
+  const [message, setMessage] = useState()
+
+  useEffect(() => {
+    const fetchData = async () => {
+      const res = await fetch('/api/hello')
+      const { message } = await res.json()
+      setMessage(message)
+    }
+    fetchData()
+  }, [])
+
+  if (!message) return <p>Loading...</p>
+
+  return <p>{message}</p>
+}
diff --git a/apps/api/next-env.d.ts b/apps/api/next-env.d.ts
@@ -0,0 +1,5 @@
+/// <reference types="next" />
+/// <reference types="next/image-types/global" />
+
+// NOTE: This file should not be edited
+// see https://nextjs.org/docs/basic-features/typescript for more information.
diff --git a/apps/api/next.config.js b/apps/api/next.config.js
@@ -0,0 +1,6 @@
+/** @type {import('next').NextConfig} */
+const nextConfig = {
+  reactStrictMode: true,
+}
+
+module.exports = nextConfig
diff --git a/apps/api/package.json b/apps/api/package.json
@@ -1,15 +1,21 @@
 {
   "name": "api",
   "scripts": {
-    "start": "vercel dev",
-    "deploy": "vercel --prod",
-    "test": "vitest"
+    "dev": "next dev",
+    "build": "next build",
+    "start": "next start",
+    "lint": "next lint"
   },
   "dependencies": {
-    "hono": "^4.6.9"
+    "hono": "^4.6.9",
+    "next": "14.2.5",
+    "react": "18.2.0",
+    "react-dom": "18.2.0"
   },
   "devDependencies": {
-    "vercel": "^32.4.1",
-    "vitest": "^2.1.4"
+    "@types/node": "18.11.18",
+    "@types/react": "18.0.26",
+    "@types/react-dom": "18.0.10",
+    "typescript": "^5"
   }
 }
diff --git a/apps/api/public/favicon.ico b/apps/api/public/favicon.ico
diff --git a/apps/api/tsconfig.json b/apps/api/tsconfig.json
@@ -1,10 +1,42 @@
 {
   "compilerOptions": {
-    "target": "ESNext",
-    "module": "ESNext",
-    "moduleResolution": "node",
-    "esModuleInterop": true,
+    "target": "es2022",
+    "lib": [
+      "dom",
+      "dom.iterable",
+      "esnext"
+    ],
+    "allowJs": true,
     "skipLibCheck": true,
     "strict": true,
+    "forceConsistentCasingInFileNames": true,
+    "noEmit": true,
+    "esModuleInterop": true,
+    "module": "esnext",
+    "moduleResolution": "node",
+    "resolveJsonModule": true,
+    "isolatedModules": true,
+    "jsx": "preserve",
+    "incremental": true,
+    "baseUrl": ".",
+    "paths": {
+      "@/*": [
+        "./*"
+      ]
+    },
+    "plugins": [
+      {
+        "name": "next"
+      }
+    ]
   },
+  "include": [
+    "next-env.d.ts",
+    "**/*.ts",
+    "**/*.tsx",
+    ".next/types/**/*.ts"
+  ],
+  "exclude": [
+    "node_modules"
+  ]
 }
diff --git a/apps/api/vercel.json b/apps/api/vercel.json
diff --git a/apps/www/Dockerfile b/apps/www/Dockerfile
@@ -1,13 +1,43 @@
-FROM node:20.12.0-alpine3.19
+FROM namesmt/images-alpine:node-aws-dev_pnpm10.0.0-alpha.0 AS base
 
+RUN pnpm install -g turbo
 WORKDIR /usr/home/plura
+COPY package.json pnpm-lock.yaml ./
+RUN pnpm install --no-frozen-lockfile
 
-COPY package.json package-lock.json turbo.json tsconfig.json ./
+FROM base AS builder
 
-RUN pnpm install
+WORKDIR /usr/home/plura
+COPY package.json pnpm-lock.yaml ./
+RUN pnpm install --no-frozen-lockfile
+COPY . .
+ENV TURBO_REMOTE_CACHE=false
+RUN turbo prune www --docker
+
+FROM base AS installer
 
+WORKDIR /usr/home/plura
+
+COPY --from=builder /usr/home/plura/out/json/ .
+RUN pnpm install --no-frozen-lockfile
+COPY --from=builder /usr/home/plura/out/full/ .
 RUN pnpm run build
+RUN turbo build --filter=www...
+
+FROM base AS runner
+
+# Don't run production as root
+# RUN addgroup --system --gid 4444 nextjs
+# RUN adduser --system --uid 4444 skidgod
+
+WORKDIR /usr/home/plura
+
+RUN pnpm install --no-frozen-lockfile
+# RUN chown -R skidgod:nextjs /root/.local/share/pnpm
+
+# USER skidgod
 
-EXPOSE 3001
+COPY --from=installer /usr/home/plura .
 
-CMD ["pnpm", "start"]
+# Run the application
+CMD ["pnpm", "start"]