From fce4577a265e9816559ffb4858c036d143f29bc7 Mon Sep 17 00:00:00 2001
From: Robert Prehn <prehnra@gmail.com>
Date: Thu, 12 May 2022 15:51:15 -0500
Subject: [PATCH] fix: Make Docker build correctly

---
 .gitignore       | 5 ++++-
 .tool-versions   | 1 +
 Dockerfile       | 2 ++
 calcom           | 2 +-
 scripts/start.sh | 2 +-
 5 files changed, 9 insertions(+), 3 deletions(-)
 create mode 100644 .tool-versions

diff --git a/.gitignore b/.gitignore
index d0c2418..4d9fcbe 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,7 @@
 # See https://help.github.com/articles/ignoring-files/ for more about ignoring files.
 
 # .env file
-.env
\ No newline at end of file
+.env
+
+# Kubernetes secrets config
+kube.yaml
diff --git a/.tool-versions b/.tool-versions
new file mode 100644
index 0000000..4b62baf
--- /dev/null
+++ b/.tool-versions
@@ -0,0 +1 @@
+nodejs 14.15.4
diff --git a/Dockerfile b/Dockerfile
index 9647923..b3c42cc 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -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 scripts scripts
 
+COPY .env .env
+
 EXPOSE 3000
 CMD ["/calcom/scripts/start.sh"]
diff --git a/calcom b/calcom
index 9440df4..f83ed78 160000
--- a/calcom
+++ b/calcom
@@ -1 +1 @@
-Subproject commit 9440df44454dd7e1ce71adfe74fe728b3809aeeb
+Subproject commit f83ed78cf692d977d08fcd186732ac64e1351b34
diff --git a/scripts/start.sh b/scripts/start.sh
index ca739de..757b06c 100755
--- a/scripts/start.sh
+++ b/scripts/start.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 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
 yarn start