From e41ff005c09f094c8a52c77a5d88ad2396f340c9 Mon Sep 17 00:00:00 2001
From: Colin Griffin <colin@krum.io>
Date: Wed, 25 May 2022 20:39:52 -0400
Subject: [PATCH] update automated docker build

---
 .../workflows/docker-build-push-dockerhub.yml | 60 ++++++++++++++-----
 1 file changed, 46 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/docker-build-push-dockerhub.yml b/.github/workflows/docker-build-push-dockerhub.yml
index 92e6310..fb3fbbc 100644
--- a/.github/workflows/docker-build-push-dockerhub.yml
+++ b/.github/workflows/docker-build-push-dockerhub.yml
@@ -55,19 +55,51 @@ jobs:
       - name: Set up Docker builder
         id: buildx
         uses: docker/setup-buildx-action@v1.6.0
-        
-      - name: Build and push image
-        id: docker_build
-        uses: docker/build-push-action@v2
-        with:
-          context: ./
-          file: ./Dockerfile
-          push: true
-          # The test image is /docker and is private. final image will be /calendso and public
-          tags: docker.io/${{ secrets.DOCKER_HUB_USERNAME }}/calendso:latest
-          build-args: |
-            BASE_URL=http://localhost:3000
-            NEXT_PUBLIC_APP_URL=http://localhost:3000
+      
+      - name: Copy env
+        run: |
+          grep -o '^[^#]*' .env.example > .env
+          cat .env >> $GITHUB_ENV
+          
+      # - name: Set up Docker Buildx
+      #   uses: docker/setup-buildx-action@v2
+      #   with:
+      #     driver-opts: |
+      #       network=stack
+
+      - name: Start database
+        run: |
+          docker compose up -d database
+              
+#       - name: Build and push image
+#         id: docker_build
+#         uses: docker/build-push-action@v2
+#         with:
+#           context: ./
+#           file: ./Dockerfile
+#           push: false
+# #           platforms: linux/amd64,linux/arm64
+#           # The test image is /docker and is private. final image will be /calendso and public
+#           tags: docker.io/${{ secrets.DOCKER_HUB_USERNAME }}/calendso:canary
+# #           network: stack
+#           build-args: |
+#             NEXT_PUBLIC_WEBAPP_URL=${{ env.NEXT_PUBLIC_WEBAPP_URL }}
+#             NEXT_PUBLIC_LICENSE_CONSENT=${{ env.NEXT_PUBLIC_LICENSE_CONSENT }}
+#             NEXT_PUBLIC_TELEMETRY_KEY=${{ env.NEXT_PUBLIC_TELEMETRY_KEY }}
+#             DATABASE_URL=postgresql://${{ env.POSTGRES_USER }}:${{ env.POSTGRES_PASSWORD }}@${{ env.DATABASE_HOST }}/${{ env.POSTGRES_DB }}
+            
+      - name: Build with docker compose
+        run: |
+          DOCKER_BUILDKIT=0 docker compose build --build-arg DATABASE_URL=postgresql://${{ env.POSTGRES_USER }}:${{ env.POSTGRES_PASSWORD }}@${{ env.DATABASE_HOST }}/${{ env.POSTGRES_DB }} calcom
+
+      - name: Push docker image
+        run: |
+          docker tag docker_calcom:latest calendso/calendso:canary
+          docker push calendso/calendso:canary
+
+      - name: Cleanup
+        run: |
+          docker compose down
 
       - name: Image digest
-        run: echo ${{ steps.docker_build.outputs.digest }}
+        run: echo ${{ steps.docker_build.outputs.digest }}
\ No newline at end of file