fix build web with docker compose
This commit is contained in:
vchikalkin
parent
ad4abdcb28
commit
ecc7b44d6d
6
apps/bot/.dockerignore
Normal file
6
apps/bot/.dockerignore
Normal file
@ -0,0 +1,6 @@
|
||||
Dockerfile
|
||||
.dockerignore
|
||||
node_modules
|
||||
npm-debug.log
|
||||
README.md
|
||||
.git
|
||||
@ -1,27 +1,36 @@
|
||||
FROM node:20-alpine AS base
|
||||
# This Dockerfile is copy-pasted into our main docs at /docs/handbook/deploying-with-docker.
|
||||
# Make sure you update both files!
|
||||
|
||||
FROM base AS builder
|
||||
RUN apk update
|
||||
FROM node:alpine AS builder
|
||||
RUN corepack enable && corepack prepare pnpm@8.9.0 --activate
|
||||
ENV PNPM_HOME=/usr/local/bin
|
||||
RUN apk add --no-cache libc6-compat
|
||||
RUN apk update
|
||||
WORKDIR /app
|
||||
RUN corepack enable && corepack prepare yarn@4.2.2 --activate
|
||||
RUN yarn global add turbo
|
||||
RUN pnpm add -g turbo@1.12.4 dotenv-cli
|
||||
COPY . .
|
||||
RUN turbo prune bot --docker
|
||||
RUN turbo prune --scope=bot --docker
|
||||
|
||||
FROM base AS installer
|
||||
RUN apk update
|
||||
FROM node:alpine AS installer
|
||||
RUN corepack enable && corepack prepare pnpm@latest --activate
|
||||
ENV PNPM_HOME=/usr/local/bin
|
||||
RUN apk add --no-cache libc6-compat
|
||||
RUN apk update
|
||||
WORKDIR /app
|
||||
COPY .gitignore .gitignore
|
||||
COPY --from=builder /app/out/json/ .
|
||||
RUN yarn install --immutable
|
||||
COPY --from=builder /app/out/pnpm-lock.yaml ./pnpm-lock.yaml
|
||||
COPY --from=builder /app/out/pnpm-workspace.yaml ./pnpm-workspace.yaml
|
||||
RUN pnpm install
|
||||
COPY --from=builder /app/out/full/ .
|
||||
RUN yarn turbo build
|
||||
COPY turbo.json turbo.json
|
||||
RUN pnpm dotenv -e .env turbo run build --filter=bot...
|
||||
|
||||
FROM base AS runner
|
||||
FROM node:alpine AS runner
|
||||
WORKDIR /app
|
||||
RUN addgroup --system --gid 1001 nodejs
|
||||
RUN addgroup --system --gid 1001 botuser
|
||||
RUN adduser --system --uid 1001 botuser
|
||||
USER botuser
|
||||
COPY --from=installer --chown=botuser:nodejs /app/apps/bot/dist ./apps/bot/dist
|
||||
COPY --from=installer /app .
|
||||
|
||||
CMD node apps/bot/dist/src/index.js
|
||||
7
apps/web/.dockerignore
Normal file
7
apps/web/.dockerignore
Normal file
@ -0,0 +1,7 @@
|
||||
Dockerfile
|
||||
.dockerignore
|
||||
node_modules
|
||||
npm-debug.log
|
||||
README.md
|
||||
.next
|
||||
.git
|
||||
@ -1,29 +1,44 @@
|
||||
FROM node:20-alpine AS base
|
||||
|
||||
FROM node:22-alpine AS base
|
||||
ENV PNPM_HOME="/pnpm"
|
||||
ENV PATH="$PNPM_HOME:$PATH"
|
||||
RUN apk add --no-cache libc6-compat && \
|
||||
corepack enable && \
|
||||
pnpm install turbo dotenv-cli --global
|
||||
|
||||
FROM base AS builder
|
||||
RUN apk update
|
||||
RUN apk add --no-cache libc6-compat
|
||||
RUN apk add --no-cache openssl
|
||||
WORKDIR /app
|
||||
RUN corepack enable && corepack prepare yarn@4.2.2 --activate
|
||||
RUN yarn global add turbo
|
||||
COPY . .
|
||||
RUN turbo prune web --docker
|
||||
|
||||
RUN turbo prune --scope=web --docker
|
||||
|
||||
FROM base AS installer
|
||||
RUN apk update
|
||||
RUN apk add --no-cache libc6-compat
|
||||
WORKDIR /app
|
||||
|
||||
COPY .gitignore .gitignore
|
||||
# COPY reset.d.ts reset.d.ts # only if you're using ts-reset library
|
||||
COPY --from=builder /app/out/json/ .
|
||||
RUN yarn install --immutable
|
||||
COPY --from=builder /app/out/full/ .
|
||||
RUN yarn turbo build
|
||||
COPY --from=builder /app/out/pnpm-lock.yaml ./pnpm-lock.yaml
|
||||
COPY --from=builder /app/out/pnpm-workspace.yaml ./pnpm-workspace.yaml
|
||||
RUN pnpm install --prod --frozen-lockfile
|
||||
|
||||
COPY --from=builder /app/out/full/ .
|
||||
COPY turbo.json turbo.json
|
||||
COPY .env .env
|
||||
|
||||
RUN dotenv -e .env turbo run build --filter=web
|
||||
|
||||
FROM base AS runner
|
||||
WORKDIR /app
|
||||
|
||||
RUN addgroup --system --gid 1001 nodejs
|
||||
RUN adduser --system --uid 1001 nextjs
|
||||
USER nextjs
|
||||
|
||||
COPY --from=installer /app/apps/web/next.config.js .
|
||||
COPY --from=installer /app/apps/web/package.json .
|
||||
|
||||
COPY --from=installer --chown=nextjs:nodejs /app/apps/web/.next/standalone ./
|
||||
COPY --from=installer --chown=nextjs:nodejs /app/apps/web/.next/static ./apps/web/.next/static
|
||||
COPY --from=installer --chown=nextjs:nodejs /app/apps/web/public ./apps/web/public
|
||||
CMD node apps/web/server.js
|
||||
|
||||
CMD node apps/web/server.js
|
||||
@ -2,7 +2,8 @@
|
||||
import { z } from 'zod';
|
||||
|
||||
export const envSchema = z.object({
|
||||
__DEV_TELEGRAM_ID: z.string(),
|
||||
__DEV_TELEGRAM_ID: z.string().default(''),
|
||||
BOT_TOKEN: z.string(),
|
||||
});
|
||||
|
||||
export const env = envSchema.parse(process.env);
|
||||
|
||||
@ -6,6 +6,7 @@ const nextConfig = withNextIntl({
|
||||
eslint: {
|
||||
ignoreDuringBuilds: true,
|
||||
},
|
||||
output: 'standalone',
|
||||
reactStrictMode: true,
|
||||
transpilePackages: ['@repo/ui'],
|
||||
});
|
||||
|
||||
@ -14,44 +14,44 @@
|
||||
"test:e2e": "playwright test"
|
||||
},
|
||||
"dependencies": {
|
||||
"@playwright/test": "^1.49.1",
|
||||
"@repo/graphql": "workspace:*",
|
||||
"@repo/typescript-config": "workspace:*",
|
||||
"@repo/ui": "workspace:*",
|
||||
"@repo/utils": "workspace:",
|
||||
"@tanstack/react-query": "^5.64.1",
|
||||
"@telegram-apps/sdk-react": "^2.0.19",
|
||||
"@testing-library/react": "^16.1.0",
|
||||
"@types/node": "catalog:",
|
||||
"@types/react-dom": "catalog:",
|
||||
"@types/react": "catalog:",
|
||||
"@vitejs/plugin-react": "^4.3.4",
|
||||
"autoprefixer": "catalog:",
|
||||
"dayjs": "catalog:",
|
||||
"eruda": "^3.4.1",
|
||||
"graphql": "catalog:",
|
||||
"jsdom": "^25.0.1",
|
||||
"lucide-react": "catalog:",
|
||||
"next": "15.3.0",
|
||||
"next-auth": "^4.24.11",
|
||||
"next-intl": "^3.26.0",
|
||||
"next-themes": "^0.4.4",
|
||||
"next": "15.3.0",
|
||||
"postcss": "catalog:",
|
||||
"radashi": "catalog:",
|
||||
"react": "catalog:",
|
||||
"react-dom": "catalog:",
|
||||
"react": "catalog:",
|
||||
"tailwindcss": "catalog:",
|
||||
"typescript": "catalog:",
|
||||
"use-debounce": "^10.0.4",
|
||||
"vite-tsconfig-paths": "catalog:",
|
||||
"vitest": "catalog:",
|
||||
"zod": "catalog:",
|
||||
"zustand": "^5.0.3"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@playwright/test": "^1.49.1",
|
||||
"@repo/eslint-config": "workspace:*",
|
||||
"@repo/lint-staged-config": "workspace:*",
|
||||
"@repo/typescript-config": "workspace:*",
|
||||
"@testing-library/react": "^16.1.0",
|
||||
"@types/node": "catalog:",
|
||||
"@types/react": "catalog:",
|
||||
"@types/react-dom": "catalog:",
|
||||
"@vitejs/plugin-react": "^4.3.4",
|
||||
"autoprefixer": "catalog:",
|
||||
"dotenv-cli": "catalog:",
|
||||
"eruda": "^3.4.1",
|
||||
"jsdom": "^25.0.1",
|
||||
"lint-staged": "catalog:",
|
||||
"postcss": "catalog:",
|
||||
"tailwindcss": "catalog:",
|
||||
"typescript": "catalog:",
|
||||
"vite-tsconfig-paths": "catalog:",
|
||||
"vitest": "catalog:"
|
||||
"lint-staged": "catalog:"
|
||||
}
|
||||
}
|
||||
|
||||
@ -1,42 +1,19 @@
|
||||
version: "3"
|
||||
|
||||
services:
|
||||
web:
|
||||
container_name: web
|
||||
env_file:
|
||||
- .env
|
||||
build:
|
||||
context: .
|
||||
dockerfile: ./apps/web/Dockerfile
|
||||
restart: always
|
||||
ports:
|
||||
- 3000:3000
|
||||
environment:
|
||||
BOT_TOKEN: ${BOT_TOKEN}
|
||||
LOGIN_GRAPHQL: ${LOGIN_GRAPHQL}
|
||||
PASSWORD_GRAPHQL: ${PASSWORD_GRAPHQL}
|
||||
URL_GRAPHQL: ${URL_GRAPHQL}
|
||||
__DEV_TELEGRAM_ID: ${__DEV_TELEGRAM_ID}
|
||||
NODE_ENV: "production"
|
||||
networks:
|
||||
- app
|
||||
- web
|
||||
bot:
|
||||
container_name: bot
|
||||
env_file:
|
||||
- .env
|
||||
build:
|
||||
context: .
|
||||
dockerfile: ./apps/bot/Dockerfile
|
||||
restart: always
|
||||
environment:
|
||||
BOT_TOKEN: ${BOT_TOKEN}
|
||||
LOGIN_GRAPHQL: ${LOGIN_GRAPHQL}
|
||||
PASSWORD_GRAPHQL: ${PASSWORD_GRAPHQL}
|
||||
URL_GRAPHQL: ${URL_GRAPHQL}
|
||||
NODE_ENV: "production"
|
||||
networks:
|
||||
- app
|
||||
- web
|
||||
|
||||
networks:
|
||||
app:
|
||||
external: true
|
||||
web:
|
||||
external: true
|
||||
@ -12,13 +12,15 @@
|
||||
"test:unit": "turbo test:unit",
|
||||
"test:e2e": "turbo test:e2e"
|
||||
},
|
||||
"devDependencies": {
|
||||
"dependencies": {
|
||||
"husky": "catalog:",
|
||||
"prettier": "catalog:",
|
||||
"turbo": "^2.3.2",
|
||||
"typescript": "catalog:"
|
||||
},
|
||||
"packageManager": "pnpm@9.14.2+sha512.6e2baf77d06b9362294152c851c4f278ede37ab1eba3a55fda317a4a17b209f4dbb973fb250a77abc463a341fcb1f17f17cfa24091c4eb319cda0d9b84278387",
|
||||
"devDependencies": {
|
||||
"prettier": "catalog:"
|
||||
},
|
||||
"packageManager": "pnpm@9.15.9",
|
||||
"engines": {
|
||||
"node": ">=18"
|
||||
}
|
||||
|
||||
@ -9,11 +9,16 @@
|
||||
},
|
||||
"dependencies": {
|
||||
"@apollo/client": "catalog:",
|
||||
"@graphql-typed-document-node/core": "^3.2.0",
|
||||
"@repo/typescript-config": "workspace:*",
|
||||
"@repo/utils": "workspace:",
|
||||
"@types/jsonwebtoken": "^9.0.7",
|
||||
"dayjs": "catalog:",
|
||||
"jsonwebtoken": "catalog:",
|
||||
"radashi": "catalog:",
|
||||
"radashi": "catalog:",
|
||||
"telegraf": "catalog:",
|
||||
"vite-tsconfig-paths": "catalog:",
|
||||
"vitest": "catalog:",
|
||||
"zod": "catalog:"
|
||||
},
|
||||
"devDependencies": {
|
||||
@ -21,12 +26,7 @@
|
||||
"@graphql-codegen/typed-document-node": "^5.0.12",
|
||||
"@graphql-codegen/typescript": "^4.1.2",
|
||||
"@graphql-codegen/typescript-operations": "^4.4.0",
|
||||
"@graphql-typed-document-node/core": "^3.2.0",
|
||||
"@repo/eslint-config": "workspace:*",
|
||||
"@repo/typescript-config": "workspace:*",
|
||||
"@types/jsonwebtoken": "^9.0.7",
|
||||
"graphql": "catalog:",
|
||||
"vite-tsconfig-paths": "catalog:",
|
||||
"vitest": "catalog:"
|
||||
"graphql": "catalog:"
|
||||
}
|
||||
}
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
import { env } from '@/config/env';
|
||||
import { env as environment } from '../config/env';
|
||||
import { Telegraf } from 'telegraf';
|
||||
|
||||
export const bot = new Telegraf(env.BOT_TOKEN);
|
||||
export const bot = new Telegraf(environment.BOT_TOKEN);
|
||||
|
||||
@ -26,22 +26,9 @@
|
||||
"type-check": "tsc --noEmit"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@radix-ui/react-slot": "^1.1.1",
|
||||
"@repo/eslint-config": "workspace:*",
|
||||
"@repo/lint-staged-config": "workspace:*",
|
||||
"@repo/typescript-config": "workspace:*",
|
||||
"@types/react": "catalog:",
|
||||
"autoprefixer": "catalog:",
|
||||
"class-variance-authority": "^0.7.1",
|
||||
"clsx": "^2.1.1",
|
||||
"lint-staged": "catalog:",
|
||||
"lucide-react": "catalog:",
|
||||
"postcss": "catalog:",
|
||||
"postcss-load-config": "catalog:",
|
||||
"tailwind-merge": "^2.5.5",
|
||||
"tailwindcss": "catalog:",
|
||||
"tailwindcss-animate": "^1.0.7",
|
||||
"typescript": "catalog:"
|
||||
"lint-staged": "catalog:"
|
||||
},
|
||||
"dependencies": {
|
||||
"@radix-ui/react-avatar": "^1.1.2",
|
||||
@ -50,11 +37,24 @@
|
||||
"@radix-ui/react-label": "^2.1.1",
|
||||
"@radix-ui/react-scroll-area": "^1.2.2",
|
||||
"@radix-ui/react-select": "^2.1.4",
|
||||
"@radix-ui/react-slot": "^1.1.1",
|
||||
"@repo/typescript-config": "workspace:*",
|
||||
"@types/react": "catalog:",
|
||||
"autoprefixer": "catalog:",
|
||||
"class-variance-authority": "^0.7.1",
|
||||
"clsx": "^2.1.1",
|
||||
"date-fns": "^4.1.0",
|
||||
"lucide-react": "catalog:",
|
||||
"next-themes": "^0.4.4",
|
||||
"react": "catalog:",
|
||||
"postcss-load-config": "catalog:",
|
||||
"postcss": "catalog:",
|
||||
"react-day-picker": "8.10.1",
|
||||
"react-dom": "catalog:",
|
||||
"sonner": "^1.7.4"
|
||||
"react": "catalog:",
|
||||
"sonner": "^1.7.4",
|
||||
"tailwind-merge": "^2.5.5",
|
||||
"tailwindcss-animate": "^1.0.7",
|
||||
"tailwindcss": "catalog:",
|
||||
"typescript": "catalog:"
|
||||
}
|
||||
}
|
||||
|
||||
@ -11,14 +11,14 @@
|
||||
"./customer": "./src/customer.ts"
|
||||
},
|
||||
"dependencies": {
|
||||
"@repo/typescript-config": "workspace:*",
|
||||
"dayjs": "catalog:",
|
||||
"radashi": "catalog:",
|
||||
"vite-tsconfig-paths": "catalog:",
|
||||
"vitest": "catalog:",
|
||||
"zod": "catalog:"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@repo/eslint-config": "workspace:*",
|
||||
"@repo/typescript-config": "workspace:*",
|
||||
"vite-tsconfig-paths": "catalog:",
|
||||
"vitest": "catalog:"
|
||||
"@repo/eslint-config": "workspace:*"
|
||||
}
|
||||
}
|
||||
|
||||
776
pnpm-lock.yaml
generated
776
pnpm-lock.yaml
generated
File diff suppressed because it is too large
Load Diff
@ -5,7 +5,8 @@
|
||||
"build": {
|
||||
"dependsOn": ["^build"],
|
||||
"inputs": ["$TURBO_DEFAULT$", ".env*"],
|
||||
"outputs": [".next/**", "!.next/cache/**"]
|
||||
"outputs": [".next/**", "!.next/cache/**"],
|
||||
"env": ["URL_GRAPHQL", "PASSWORD_GRAPHQL", "LOGIN_GRAPHQL", "BOT_TOKEN", "NEXTAUTH_SECRET"]
|
||||
},
|
||||
"lint": {
|
||||
"dependsOn": ["^lint"]
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user