diff --git a/Dockerfile b/Dockerfile index 204e52cf29..c223bc23e6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -19,20 +19,20 @@ ARG NEXT_PUBLIC_SINGLE_ORG_SLUG ARG ORGANIZATIONS_ENABLED ENV NEXT_PUBLIC_WEBAPP_URL=http://NEXT_PUBLIC_WEBAPP_URL_PLACEHOLDER \ - NEXT_PUBLIC_API_V2_URL=$NEXT_PUBLIC_API_V2_URL \ - NEXT_PUBLIC_LICENSE_CONSENT=$NEXT_PUBLIC_LICENSE_CONSENT \ - NEXT_PUBLIC_WEBSITE_TERMS_URL=$NEXT_PUBLIC_WEBSITE_TERMS_URL \ - NEXT_PUBLIC_WEBSITE_PRIVACY_POLICY_URL=$NEXT_PUBLIC_WEBSITE_PRIVACY_POLICY_URL \ - CALCOM_TELEMETRY_DISABLED=$CALCOM_TELEMETRY_DISABLED \ - DATABASE_URL=$DATABASE_URL \ - DATABASE_DIRECT_URL=$DATABASE_URL \ - NEXTAUTH_SECRET=${NEXTAUTH_SECRET} \ - CALENDSO_ENCRYPTION_KEY=${CALENDSO_ENCRYPTION_KEY} \ - NEXT_PUBLIC_SINGLE_ORG_SLUG=$NEXT_PUBLIC_SINGLE_ORG_SLUG \ - ORGANIZATIONS_ENABLED=$ORGANIZATIONS_ENABLED \ - NODE_OPTIONS=--max-old-space-size=${MAX_OLD_SPACE_SIZE} \ - BUILD_STANDALONE=true \ - CSP_POLICY=$CSP_POLICY + NEXT_PUBLIC_API_V2_URL=$NEXT_PUBLIC_API_V2_URL \ + NEXT_PUBLIC_LICENSE_CONSENT=$NEXT_PUBLIC_LICENSE_CONSENT \ + NEXT_PUBLIC_WEBSITE_TERMS_URL=$NEXT_PUBLIC_WEBSITE_TERMS_URL \ + NEXT_PUBLIC_WEBSITE_PRIVACY_POLICY_URL=$NEXT_PUBLIC_WEBSITE_PRIVACY_POLICY_URL \ + CALCOM_TELEMETRY_DISABLED=$CALCOM_TELEMETRY_DISABLED \ + DATABASE_URL=$DATABASE_URL \ + DATABASE_DIRECT_URL=$DATABASE_URL \ + NEXTAUTH_SECRET=${NEXTAUTH_SECRET} \ + CALENDSO_ENCRYPTION_KEY=${CALENDSO_ENCRYPTION_KEY} \ + NEXT_PUBLIC_SINGLE_ORG_SLUG=$NEXT_PUBLIC_SINGLE_ORG_SLUG \ + ORGANIZATIONS_ENABLED=$ORGANIZATIONS_ENABLED \ + NODE_OPTIONS=--max-old-space-size=${MAX_OLD_SPACE_SIZE} \ + BUILD_STANDALONE=true \ + CSP_POLICY=$CSP_POLICY COPY package.json yarn.lock .yarnrc.yml playwright.config.ts turbo.json i18n.json ./ COPY .yarn ./.yarn @@ -47,6 +47,7 @@ RUN yarn install # Build and make embed servable from web/public/embed folder RUN yarn workspace @calcom/trpc run build RUN yarn --cwd packages/embeds/embed-core workspace @calcom/embed-core run build +RUN yarn --cwd apps/web workspace @calcom/web run copy-app-store-static RUN yarn --cwd apps/web workspace @calcom/web run build RUN rm -rf node_modules/.cache .yarn/cache apps/web/.next/cache @@ -70,7 +71,7 @@ RUN chmod +x scripts/* # Save value used during this build stage. If NEXT_PUBLIC_WEBAPP_URL and BUILT_NEXT_PUBLIC_WEBAPP_URL differ at # run-time, then start.sh will find/replace static values again. ENV NEXT_PUBLIC_WEBAPP_URL=$NEXT_PUBLIC_WEBAPP_URL \ - BUILT_NEXT_PUBLIC_WEBAPP_URL=$NEXT_PUBLIC_WEBAPP_URL + BUILT_NEXT_PUBLIC_WEBAPP_URL=$NEXT_PUBLIC_WEBAPP_URL RUN scripts/replace-placeholder.sh http://NEXT_PUBLIC_WEBAPP_URL_PLACEHOLDER ${NEXT_PUBLIC_WEBAPP_URL} @@ -83,12 +84,12 @@ RUN apt-get update && apt-get install -y --no-install-recommends netcat-openbsd COPY --from=builder-two /calcom ./ ARG NEXT_PUBLIC_WEBAPP_URL=http://localhost:3000 ENV NEXT_PUBLIC_WEBAPP_URL=$NEXT_PUBLIC_WEBAPP_URL \ - BUILT_NEXT_PUBLIC_WEBAPP_URL=$NEXT_PUBLIC_WEBAPP_URL + BUILT_NEXT_PUBLIC_WEBAPP_URL=$NEXT_PUBLIC_WEBAPP_URL ENV NODE_ENV=production EXPOSE 3000 HEALTHCHECK --interval=30s --timeout=30s --retries=5 \ - CMD wget --spider http://localhost:3000 || exit 1 + CMD wget --spider http://localhost:3000 || exit 1 CMD ["/calcom/scripts/start.sh"]