From fecd84ce7957c4375f16e4a1eabc6c399fa2fb67 Mon Sep 17 00:00:00 2001
From: Till Faelligen <2353100+S7evinK@users.noreply.github.com>
Date: Wed, 18 Dec 2024 12:14:02 +0100
Subject: [PATCH] Add docker syntax and re-add cache-from [skip ci]

---
 .github/workflows/docker.yml           | 4 ++++
 build/docker/Dockerfile.demo-pinecone  | 2 ++
 build/docker/Dockerfile.demo-yggdrasil | 2 ++
 3 files changed, 8 insertions(+)

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 4329ec0f..425945ed 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -137,6 +137,7 @@ jobs:
         id: docker_build_demo_pinecone
         uses: docker/build-push-action@v3
         with:
+          cache-from: type=registry,ref=ghcr.io/${{ env.GHCR_NAMESPACE }}/dendrite:buildcache
           context: .
           file: ./build/docker/Dockerfile.demo-pinecone
           platforms: ${{ env.PLATFORMS }}
@@ -150,6 +151,7 @@ jobs:
         id: docker_build_demo_pinecone_release
         uses: docker/build-push-action@v3
         with:
+          cache-from: type=registry,ref=ghcr.io/${{ env.GHCR_NAMESPACE }}/dendrite:buildcache
           context: .
           file: ./build/docker/Dockerfile.demo-pinecone
           platforms: ${{ env.PLATFORMS }}
@@ -195,6 +197,7 @@ jobs:
         id: docker_build_demo_yggdrasil
         uses: docker/build-push-action@v3
         with:
+          cache-from: type=registry,ref=ghcr.io/${{ env.GHCR_NAMESPACE }}/dendrite:buildcache
           context: .
           file: ./build/docker/Dockerfile.demo-yggdrasil
           platforms: ${{ env.PLATFORMS }}
@@ -208,6 +211,7 @@ jobs:
         id: docker_build_demo_yggdrasil_release
         uses: docker/build-push-action@v3
         with:
+          cache-from: type=registry,ref=ghcr.io/${{ env.GHCR_NAMESPACE }}/dendrite:buildcache
           context: .
           file: ./build/docker/Dockerfile.demo-yggdrasil
           platforms: ${{ env.PLATFORMS }}
diff --git a/build/docker/Dockerfile.demo-pinecone b/build/docker/Dockerfile.demo-pinecone
index c6ef7129..e892570c 100644
--- a/build/docker/Dockerfile.demo-pinecone
+++ b/build/docker/Dockerfile.demo-pinecone
@@ -1,3 +1,5 @@
+#syntax=docker/dockerfile:1.2
+
 FROM --platform=${BUILDPLATFORM} ghcr.io/element-hq/dendrite:buildcache AS build
 
 FROM alpine:latest
diff --git a/build/docker/Dockerfile.demo-yggdrasil b/build/docker/Dockerfile.demo-yggdrasil
index bbd09ee5..c71326d9 100644
--- a/build/docker/Dockerfile.demo-yggdrasil
+++ b/build/docker/Dockerfile.demo-yggdrasil
@@ -1,3 +1,5 @@
+#syntax=docker/dockerfile:1.2
+
 FROM --platform=${BUILDPLATFORM} ghcr.io/element-hq/dendrite:buildcache AS build
 
 FROM alpine:latest