Merge pull request #86 from searsaw/fix-workspaces-build-issues

Update Dockerfile to use workspaces setup

Dockerfile

@@ -1,8 +1,11 @@
 FROM node:14 as deps
 
 WORKDIR /calcom
-COPY calendso/apps/web/package.json calendso/apps/web/yarn.lock ./
-COPY calendso/apps/web/prisma prisma
+COPY calendso/package.json calendso/yarn.lock ./
+COPY calendso/apps/web/package.json calendso/apps/web/yarn.lock ./apps/web/
+COPY calendso/packages/prisma/package.json ./packages/prisma/package.json
+COPY calendso/packages/lib/package.json ./packages/lib/package.json
+COPY calendso/packages/tsconfig/package.json ./packages/tsconfig/package.json
 # RUN yarn install --frozen-lockfile
 RUN yarn install
 
@@ -18,24 +21,30 @@ ENV BASE_URL=$BASE_URL \
     NEXT_PUBLIC_LICENSE_CONSENT=$NEXT_PUBLIC_LICENSE_CONSENT \
     NEXT_PUBLIC_TELEMETRY_KEY=$NEXT_PUBLIC_TELEMETRY_KEY
 
+COPY calendso/package.json calendso/yarn.lock calendso/turbo.json ./
 COPY calendso/apps/web ./apps/web
 COPY calendso/packages ./packages
-COPY --from=deps /calcom/node_modules ./apps/web/node_modules
-WORKDIR /calcom/apps/web
+COPY --from=deps /calcom/node_modules ./node_modules
 RUN yarn build && yarn install --production --ignore-scripts --prefer-offline
 
 FROM node:14 as runner
 WORKDIR /calcom
 ENV NODE_ENV production
+RUN apt-get update && \
+    apt-get -y install netcat && \
+    rm -rf /var/lib/apt/lists/* && \
+    npm install --global prisma
 
-COPY --from=builder /calcom/apps/web/node_modules ./node_modules
-COPY --from=builder /calcom/apps/web/prisma ./prisma
-COPY --from=builder /calcom/apps/web/scripts ./scripts
-COPY --from=builder /calcom/apps/web/next.config.js ./
-COPY --from=builder /calcom/apps/web/next-i18next.config.js ./
-COPY --from=builder /calcom/apps/web/public ./public
-COPY --from=builder /calcom/apps/web/.next ./.next
-COPY --from=builder /calcom/apps/web/package.json ./package.json
+COPY calendso/package.json calendso/yarn.lock calendso/turbo.json ./
+COPY --from=builder /calcom/node_modules ./node_modules
+COPY --from=builder /calcom/packages ./packages
+COPY --from=builder /calcom/apps/web/node_modules ./apps/web/node_modules
+COPY --from=builder /calcom/apps/web/scripts ./apps/web/scripts
+COPY --from=builder /calcom/apps/web/next.config.js ./apps/web/next.config.js
+COPY --from=builder /calcom/apps/web/next-i18next.config.js ./apps/web/next-i18next.config.js
+COPY --from=builder /calcom/apps/web/public ./apps/web/public
+COPY --from=builder /calcom/apps/web/.next ./apps/web/.next
+COPY --from=builder /calcom/apps/web/package.json ./apps/web/package.json
 COPY  scripts scripts
 
 EXPOSE 3000

docker-compose.yaml

@@ -27,7 +27,6 @@ services:
         - NEXT_PUBLIC_APP_URL=${NEXT_PUBLIC_APP_URL}
         - NEXT_PUBLIC_LICENSE_CONSENT=${NEXT_PUBLIC_LICENSE_CONSENT}
         - NEXT_PUBLIC_TELEMETRY_KEY=${NEXT_PUBLIC_TELEMETRY_KEY}
-    image: calendso/calendso:latest
     restart: always
     networks:
       - stack

scripts/start.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 set -x
 
-/app/scripts/wait-for-it.sh ${DATABASE_HOST} -- echo "database is up"
-npx prisma migrate deploy
+/calcom/scripts/wait-for-it.sh ${DATABASE_HOST} -- echo "database is up"
+npx prisma migrate deploy --schema /calcom/packages/prisma/schema.prisma
 yarn start

scripts/wait-for-it.sh

@@ -54,7 +54,7 @@ wait_for() {
       ;;
     wget)
       if ! command -v wget >/dev/null; then
-        echoerr 'nc command is missing!'
+        echoerr 'wget command is missing!'
         exit 1
       fi
       ;;