Compare commits

..

No commits in common. "fce4577a265e9816559ffb4858c036d143f29bc7" and "05ebcc826ea233ed80e78e77dfbeaf260871590b" have entirely different histories.

6 changed files with 4 additions and 10 deletions

3
.gitignore vendored
View file

@ -2,6 +2,3 @@
# .env file # .env file
.env .env
# Kubernetes secrets config
kube.yaml

View file

@ -1 +0,0 @@
nodejs 14.15.4

View file

@ -84,7 +84,5 @@ COPY --from=builder /calcom/apps/web/package.json ./apps/web/package.json
COPY --from=builder calcom/packages/prisma/schema.prisma ./prisma/schema.prisma COPY --from=builder calcom/packages/prisma/schema.prisma ./prisma/schema.prisma
COPY scripts scripts COPY scripts scripts
COPY .env .env
EXPOSE 3000 EXPOSE 3000
CMD ["/calcom/scripts/start.sh"] CMD ["/calcom/scripts/start.sh"]

View file

@ -35,7 +35,7 @@ Note: `docker compose` without the hyphen is now the primary method of using doc
1. Clone calcom-docker 1. Clone calcom-docker
```bash ```bash
git clone https://github.com/calcom/docker.git calcom-docker git clone --recursive https://github.com/calcom/docker.git calcom-docker
``` ```
2. Change into the directory 2. Change into the directory

2
calcom

@ -1 +1 @@
Subproject commit f83ed78cf692d977d08fcd186732ac64e1351b34 Subproject commit 21867c9cd43b69dfd9b1857cea3291edd56adc03

View file

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