From 2e11199764cdb25d70f17c1b800ae652b4dcb275 Mon Sep 17 00:00:00 2001 From: Henry Date: Tue, 17 Jun 2025 10:57:54 +0100 Subject: [PATCH] fix: add old docker compose and revert entrypoint --- apps/web/Dockerfile | 10 +++--- apps/web/next.config.js | 2 +- docker-compose-old.yml | 78 +++++++++++++++++++++++++++++++++++++++++ 3 files changed, 84 insertions(+), 6 deletions(-) create mode 100644 docker-compose-old.yml diff --git a/apps/web/Dockerfile b/apps/web/Dockerfile index 6519a83f..bebb9bf2 100644 --- a/apps/web/Dockerfile +++ b/apps/web/Dockerfile @@ -56,10 +56,10 @@ COPY --from=pruner /app/out/full/ . RUN pnpm build --filter=${PROJECT} -# Copy static files to standalone directory -RUN mkdir -p apps/web/.next/standalone/.next && \ -mv apps/web/public apps/web/.next/standalone/ && \ -mv apps/web/.next/static apps/web/.next/standalone/.next/ +# # Copy static files to standalone directory +# RUN mkdir -p apps/web/.next/standalone/.next && \ +# mv apps/web/public apps/web/.next/standalone/ && \ +# mv apps/web/.next/static apps/web/.next/standalone/.next/ # 4. Final image - runner stage to run the application FROM base AS runner @@ -81,5 +81,5 @@ ARG PORT=3000 ENV PORT=${PORT} EXPOSE ${PORT} -CMD ["/bin/sh", "./entrypoint.sh"] +CMD ["sh", "-c", "cd /app && pnpm db:migrate && cd /app/apps/web && pnpm start"] diff --git a/apps/web/next.config.js b/apps/web/next.config.js index 08f0f5d2..51c0cb18 100644 --- a/apps/web/next.config.js +++ b/apps/web/next.config.js @@ -10,7 +10,7 @@ configureRuntimeEnv(); /** @type {import("next").NextConfig} */ const config = { - output: "standalone", + // output: "standalone", reactStrictMode: true, /** Enables hot reloading for local packages without a build step */ diff --git a/docker-compose-old.yml b/docker-compose-old.yml new file mode 100644 index 00000000..15571701 --- /dev/null +++ b/docker-compose-old.yml @@ -0,0 +1,78 @@ +services: + web: + image: ghcr.io/kanbn/kan:latest + ports: + - "3001:3000" + networks: + - dokploy-network + build: + context: . + dockerfile: ./apps/web/Dockerfile + env_file: + - .env + command: ["pnpm", "start"] + environment: + - EMAIL_FROM=${EMAIL_FROM} + - SMTP_HOST=${SMTP_HOST} + - SMTP_PORT=${SMTP_PORT} + - SMTP_USER=${SMTP_USER} + - SMTP_PASSWORD=${SMTP_PASSWORD} + - BETTER_AUTH_SECRET=${BETTER_AUTH_SECRET} + - BETTER_AUTH_TRUSTED_ORIGINS=${BETTER_AUTH_TRUSTED_ORIGINS} + - STRIPE_SECRET_KEY=${STRIPE_SECRET_KEY} + - STRIPE_WEBHOOK_SECRET=${STRIPE_WEBHOOK_SECRET} + - POSTGRES_URL=${POSTGRES_URL} + - TRELLO_APP_API_KEY=${TRELLO_APP_API_KEY} + - TRELLO_APP_SECRET=${TRELLO_APP_SECRET} + - GOOGLE_CLIENT_ID=${GOOGLE_CLIENT_ID} + - GOOGLE_CLIENT_SECRET=${GOOGLE_CLIENT_SECRET} + - DISCORD_CLIENT_ID=${DISCORD_CLIENT_ID} + - DISCORD_CLIENT_SECRET=${DISCORD_CLIENT_SECRET} + - GITHUB_CLIENT_ID=${GITHUB_CLIENT_ID} + - GITHUB_CLIENT_SECRET=${GITHUB_CLIENT_SECRET} + - GITLAB_CLIENT_ID=${GITLAB_CLIENT_ID} + - GITLAB_CLIENT_SECRET=${GITLAB_CLIENT_SECRET} + - GITLAB_ISSUER=${GITLAB_ISSUER} + - MICROSOFT_CLIENT_ID=${MICROSOFT_CLIENT_ID} + - MICROSOFT_CLIENT_SECRET=${MICROSOFT_CLIENT_SECRET} + - TWITTER_CLIENT_ID=${TWITTER_CLIENT_ID} + - TWITTER_CLIENT_SECRET=${TWITTER_CLIENT_SECRET} + - KICK_CLIENT_ID=${KICK_CLIENT_ID} + - KICK_CLIENT_SECRET=${KICK_CLIENT_SECRET} + - ZOOM_CLIENT_ID=${ZOOM_CLIENT_ID} + - ZOOM_CLIENT_SECRET=${ZOOM_CLIENT_SECRET} + - DROPBOX_CLIENT_ID=${DROPBOX_CLIENT_ID} + - DROPBOX_CLIENT_SECRET=${DROPBOX_CLIENT_SECRET} + - VK_CLIENT_ID=${VK_CLIENT_ID} + - VK_CLIENT_SECRET=${VK_CLIENT_SECRET} + - LINKEDIN_CLIENT_ID=${LINKEDIN_CLIENT_ID} + - LINKEDIN_CLIENT_SECRET=${LINKEDIN_CLIENT_SECRET} + - REDDIT_CLIENT_ID=${REDDIT_CLIENT_ID} + - REDDIT_CLIENT_SECRET=${REDDIT_CLIENT_SECRET} + - ROBLOX_CLIENT_ID=${ROBLOX_CLIENT_ID} + - ROBLOX_CLIENT_SECRET=${ROBLOX_CLIENT_SECRET} + - SPOTIFY_CLIENT_ID=${SPOTIFY_CLIENT_ID} + - SPOTIFY_CLIENT_SECRET=${SPOTIFY_CLIENT_SECRET} + - TIKTOK_CLIENT_ID=${TIKTOK_CLIENT_ID} + - TIKTOK_CLIENT_SECRET=${TIKTOK_CLIENT_SECRET} + - TIKTOK_CLIENT_KEY=${TIKTOK_CLIENT_KEY} + - TWITCH_CLIENT_ID=${TWITCH_CLIENT_ID} + - TWITCH_CLIENT_SECRET=${TWITCH_CLIENT_SECRET} + - APPLE_CLIENT_ID=${APPLE_CLIENT_ID} + - APPLE_CLIENT_SECRET=${APPLE_CLIENT_SECRET} + - APPLE_APP_BUNDLE_IDENTIFIER=${APPLE_APP_BUNDLE_IDENTIFIER} + - S3_ACCESS_KEY_ID=${S3_ACCESS_KEY_ID} + - S3_SECRET_ACCESS_KEY=${S3_SECRET_ACCESS_KEY} + - S3_REGION=${S3_REGION} + - S3_ENDPOINT=${S3_ENDPOINT} + - NEXT_PUBLIC_KAN_ENV=${NEXT_PUBLIC_KAN_ENV} + - NEXT_PUBLIC_BASE_URL=${NEXT_PUBLIC_BASE_URL} + - NEXT_PUBLIC_STORAGE_URL=${NEXT_PUBLIC_STORAGE_URL} + - NEXT_PUBLIC_AVATAR_BUCKET_NAME=${NEXT_PUBLIC_AVATAR_BUCKET_NAME} + - NEXT_PUBLIC_STORAGE_DOMAIN=${NEXT_PUBLIC_STORAGE_DOMAIN} + - NEXT_PUBLIC_UMAMI_ID=${NEXT_PUBLIC_UMAMI_ID} + - NEXT_PUBLIC_ALLOW_CREDENTIALS=${NEXT_PUBLIC_ALLOW_CREDENTIALS} + - NEXT_PUBLIC_DISABLE_SIGN_UP=${NEXT_PUBLIC_DISABLE_SIGN_UP} +networks: + dokploy-network: + external: true