Update Dockerfile to use workspaces setup

The main Cal.com project has started using Yarn workspaces to
break the project up into separate packages and treat the project
as a monorepo. This required quite a few changes to the Dockerfile
that assumed the previous project setup.

Signed-off-by: Alex Sears <me@alexsears.com>
This commit is contained in:
Alex Sears 2022-02-17 16:04:27 -05:00
parent f3942ca6f5
commit 05560ff1a3
No known key found for this signature in database
GPG key ID: B00C1DBE761753A4
4 changed files with 27 additions and 22 deletions

View file

@ -1,8 +1,11 @@
FROM node:14 as deps FROM node:14 as deps
WORKDIR /calcom WORKDIR /calcom
COPY calendso/apps/web/package.json calendso/apps/web/yarn.lock ./ COPY calendso/package.json calendso/yarn.lock ./
COPY calendso/apps/web/prisma prisma 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 --frozen-lockfile
RUN yarn install RUN yarn install
@ -12,30 +15,33 @@ WORKDIR /calcom
ARG BASE_URL ARG BASE_URL
ARG NEXT_PUBLIC_APP_URL ARG NEXT_PUBLIC_APP_URL
ARG NEXT_PUBLIC_LICENSE_CONSENT ARG NEXT_PUBLIC_LICENSE_CONSENT
ARG NEXT_PUBLIC_TELEMETRY_KEY ARG NEXT_PUBLIC_TELEMETRY_KEY
ENV BASE_URL=$BASE_URL \ ENV BASE_URL=$BASE_URL \
NEXT_PUBLIC_APP_URL=$NEXT_PUBLIC_APP_URL \ NEXT_PUBLIC_APP_URL=$NEXT_PUBLIC_APP_URL \
NEXT_PUBLIC_LICENSE_CONSENT=$NEXT_PUBLIC_LICENSE_CONSENT \ NEXT_PUBLIC_LICENSE_CONSENT=$NEXT_PUBLIC_LICENSE_CONSENT \
NEXT_PUBLIC_TELEMETRY_KEY=$NEXT_PUBLIC_TELEMETRY_KEY 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/apps/web ./apps/web
COPY calendso/packages ./packages COPY calendso/packages ./packages
COPY --from=deps /calcom/node_modules ./apps/web/node_modules COPY --from=deps /calcom/node_modules ./node_modules
WORKDIR /calcom/apps/web
RUN yarn build && yarn install --production --ignore-scripts --prefer-offline RUN yarn build && yarn install --production --ignore-scripts --prefer-offline
FROM node:14 as runner FROM node:14 as runner
WORKDIR /calcom WORKDIR /calcom
ENV NODE_ENV production ENV NODE_ENV production
RUN apt-get update && apt-get -y install netcat && rm -rf /var/lib/apt/lists/*
COPY --from=builder /calcom/apps/web/node_modules ./node_modules COPY calendso/package.json calendso/yarn.lock calendso/turbo.json ./
COPY --from=builder /calcom/apps/web/prisma ./prisma COPY --from=builder /calcom/node_modules ./node_modules
COPY --from=builder /calcom/apps/web/scripts ./scripts COPY --from=builder /calcom/packages ./packages
COPY --from=builder /calcom/apps/web/next.config.js ./ COPY --from=builder /calcom/apps/web/node_modules ./apps/web/node_modules
COPY --from=builder /calcom/apps/web/next-i18next.config.js ./ COPY --from=builder /calcom/apps/web/scripts ./apps/web/scripts
COPY --from=builder /calcom/apps/web/public ./public COPY --from=builder /calcom/apps/web/next.config.js ./apps/web/next.config.js
COPY --from=builder /calcom/apps/web/.next ./.next COPY --from=builder /calcom/apps/web/next-i18next.config.js ./apps/web/next-i18next.config.js
COPY --from=builder /calcom/apps/web/package.json ./package.json 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 COPY scripts scripts
EXPOSE 3000 EXPOSE 3000

View file

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

View file

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

View file

@ -54,7 +54,7 @@ wait_for() {
;; ;;
wget) wget)
if ! command -v wget >/dev/null; then if ! command -v wget >/dev/null; then
echoerr 'nc command is missing!' echoerr 'wget command is missing!'
exit 1 exit 1
fi fi
;; ;;
@ -62,11 +62,11 @@ wait_for() {
while :; do while :; do
case "$PROTOCOL" in case "$PROTOCOL" in
tcp) tcp)
nc -w 1 -z "$HOST" "$PORT" > /dev/null 2>&1 nc -w 1 -z "$HOST" "$PORT" > /dev/null 2>&1
;; ;;
http) http)
wget --timeout=1 -q "$HOST" -O /dev/null > /dev/null 2>&1 wget --timeout=1 -q "$HOST" -O /dev/null > /dev/null 2>&1
;; ;;
*) *)
echoerr "Unknown protocol '$PROTOCOL'" echoerr "Unknown protocol '$PROTOCOL'"
@ -75,7 +75,7 @@ wait_for() {
esac esac
result=$? result=$?
if [ $result -eq 0 ] ; then if [ $result -eq 0 ] ; then
if [ $# -gt 7 ] ; then if [ $# -gt 7 ] ; then
for result in $(seq $(($# - 7))); do for result in $(seq $(($# - 7))); do
@ -181,4 +181,4 @@ case "$PROTOCOL" in
;; ;;
esac esac
wait_for "$@" wait_for "$@"