From 676a5005e7487e705093db790b8eae651b7a3601 Mon Sep 17 00:00:00 2001
From: Mo Balaa <thebalaa@users.noreply.github.com>
Date: Thu, 20 Jul 2023 13:12:34 -0500
Subject: [PATCH 1/4] Add synapse version as Docker container label

---
 .github/workflows/docker.yml | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 602f5e1759d0..fbff61adaa68 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -28,6 +28,10 @@ jobs:
 
       - name: Inspect builder
         run: docker buildx inspect
+      
+      - name: Extract version from pyproject.toml
+        run: |
+          echo "SYNAPSE_VERSION=$(grep "^version" pyproject.toml | sed -E 's/version\s*=\s*["]([^"]*)["]/\1/')" >> $GITHUB_ENV
 
       - name: Log in to DockerHub
         uses: docker/login-action@v2
@@ -61,7 +65,9 @@ jobs:
         uses: docker/build-push-action@v4
         with:
           push: true
-          labels: "gitsha1=${{ github.sha }}"
+          labels: |
+            gitsha1=${{ github.sha }}
+            version=${{ env.SYNAPSE_VERSION }}
           tags: "${{ steps.set-tag.outputs.tags }}"
           file: "docker/Dockerfile"
           platforms: linux/amd64,linux/arm64

From 0686e34b8ffb6aeafd7ed82697daffe7da62a311 Mon Sep 17 00:00:00 2001
From: Mo Balaa <thebalaa@users.noreply.github.com>
Date: Mon, 24 Jul 2023 12:07:33 -0500
Subject: [PATCH 2/4] Update docker.yml

---
 .github/workflows/docker.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index fbff61adaa68..cf98a6a86fa4 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -67,7 +67,7 @@ jobs:
           push: true
           labels: |
             gitsha1=${{ github.sha }}
-            version=${{ env.SYNAPSE_VERSION }}
+            org.opencontainers.image.version=${{ env.SYNAPSE_VERSION }}
           tags: "${{ steps.set-tag.outputs.tags }}"
           file: "docker/Dockerfile"
           platforms: linux/amd64,linux/arm64

From 841ed1aa3b27369be28dd5323f9160f184a8bd9f Mon Sep 17 00:00:00 2001
From: Mo Balaa <balaa@fractalnetworks.co>
Date: Mon, 24 Jul 2023 12:23:05 -0500
Subject: [PATCH 3/4] Add changelog file

---
 changelog.d/15972.docker | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 changelog.d/15972.docker

diff --git a/changelog.d/15972.docker b/changelog.d/15972.docker
new file mode 100644
index 000000000000..00c7bd185766
--- /dev/null
+++ b/changelog.d/15972.docker
@@ -0,0 +1 @@
+Adds `org.opencontainers.image.version` to Synape's Docker container. Contributed by Mo Balaa

From 96efd8556b3de6375d0e545a454def8614fdc3dc Mon Sep 17 00:00:00 2001
From: David Robertson <david.m.robertson1@gmail.com>
Date: Mon, 24 Jul 2023 18:47:11 +0100
Subject: [PATCH 4/4] Tweak changelog

---
 changelog.d/15972.docker | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/changelog.d/15972.docker b/changelog.d/15972.docker
index 00c7bd185766..7fd9707deb35 100644
--- a/changelog.d/15972.docker
+++ b/changelog.d/15972.docker
@@ -1 +1 @@
-Adds `org.opencontainers.image.version` to Synape's Docker container. Contributed by Mo Balaa
+Add `org.opencontainers.image.version` labels to Docker containers [published by Matrix.org](https://hub.docker.com/r/matrixdotorg/synapse). Contributed by Mo Balaa.