Compare commits

...

10 commits

Author SHA1 Message Date
Robert Prehn
fce4577a26 fix: Make Docker build correctly
Some checks failed
Build and push image to DockerHub / build (push) Has been cancelled
2022-05-12 15:51:15 -05:00
actions-user
f7955a6aad Auto updated submodule references 2022-05-10 04:22:00 +00:00
actions-user
2f66070106 Auto updated submodule references 2022-05-08 04:23:03 +00:00
actions-user
f843f997be Auto updated submodule references 2022-05-07 04:20:49 +00:00
actions-user
c5a4b03d66 Auto updated submodule references 2022-05-06 04:21:57 +00:00
Colin Griffin
0bbff68c65
Merge pull request #106 from calcom/fix/remove-recursive
Remove recursive flag on clone instructions
2022-05-05 14:06:01 -04:00
Colin Griffin
7fd09ede40
remove recursive flag on clone instructions 2022-05-05 14:05:18 -04:00
actions-user
89e7aafeac Auto updated submodule references 2022-05-05 04:33:34 +00:00
actions-user
c6ee520d85 Auto updated submodule references 2022-05-04 04:30:26 +00:00
actions-user
83387bea9f Auto updated submodule references 2022-05-03 04:31:26 +00:00
6 changed files with 10 additions and 4 deletions

5
.gitignore vendored
View file

@ -1,4 +1,7 @@
# See https://help.github.com/articles/ignoring-files/ for more about ignoring files. # See https://help.github.com/articles/ignoring-files/ for more about ignoring files.
# .env file # .env file
.env .env
# Kubernetes secrets config
kube.yaml

1
.tool-versions Normal file
View file

@ -0,0 +1 @@
nodejs 14.15.4

View file

@ -84,5 +84,7 @@ 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 --recursive https://github.com/calcom/docker.git calcom-docker git clone https://github.com/calcom/docker.git calcom-docker
``` ```
2. Change into the directory 2. Change into the directory

2
calcom

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

View file

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