From ad9cb91384484c95b4c942197879b6630195d5e6 Mon Sep 17 00:00:00 2001
From: David Robertson <davidr@element.io>
Date: Thu, 27 Jul 2023 01:26:42 +0100
Subject: [PATCH 1/2] Attempt to fix labelling in docker workflow

Per https://github.com/matrix-org/synapse/pull/15972#issuecomment-1652665329

Completely untested.
---
 .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 cf98a6a86fa4..8a69dc4986e9 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -28,8 +28,14 @@ jobs:
 
       - name: Inspect builder
         run: docker buildx inspect
-      
+
+      - name: Checkout repository
+        uses: actions/checkout@v3
+
       - name: Extract version from pyproject.toml
+        # Note: explicitly requesting bash will mean bash is invoked with `-eo pipefail`, see
+        # https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsshell
+        shell: bash
         run: |
           echo "SYNAPSE_VERSION=$(grep "^version" pyproject.toml | sed -E 's/version\s*=\s*["]([^"]*)["]/\1/')" >> $GITHUB_ENV
 

From 41f4205c7b09fc93c14e7b97d2989d336b3ee69c Mon Sep 17 00:00:00 2001
From: David Robertson <davidr@element.io>
Date: Thu, 27 Jul 2023 01:28:45 +0100
Subject: [PATCH 2/2] Changelog

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

diff --git a/changelog.d/16009.docker b/changelog.d/16009.docker
new file mode 100644
index 000000000000..7fd9707deb35
--- /dev/null
+++ b/changelog.d/16009.docker
@@ -0,0 +1 @@
+Add `org.opencontainers.image.version` labels to Docker containers [published by Matrix.org](https://hub.docker.com/r/matrixdotorg/synapse). Contributed by Mo Balaa.