From 1be4c12fd2ac6bb98ab59f87076a9305ba3a88ea Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Tue, 6 Aug 2024 18:02:50 +0100
Subject: [PATCH] Switch to ghcr.io image for Synapse (#12869)

Due to dockerhub rate-limiting

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 .github/workflows/playwright-image-updates.yaml | 4 ++--
 docs/playwright.md                              | 2 +-
 playwright/plugins/homeserver/synapse/index.ts  | 6 +++---
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/playwright-image-updates.yaml b/.github/workflows/playwright-image-updates.yaml
index a160b77bcf..761d8a8b6c 100644
--- a/.github/workflows/playwright-image-updates.yaml
+++ b/.github/workflows/playwright-image-updates.yaml
@@ -9,14 +9,14 @@ jobs:
         steps:
             - uses: actions/checkout@v4
 
-            - name: Update matrixdotorg/synapse image
+            - name: Update synapse image
               run: |
                   docker pull "$IMAGE"
                   INSPECT=$(docker inspect --format='{{index .RepoDigests 0}}' "$IMAGE")
                   DIGEST=${INSPECT#*@}
                   sed -i "s/const DOCKER_TAG.*/const DOCKER_TAG = \"develop@$DIGEST\";/" playwright/plugins/homeserver/synapse/index.ts
               env:
-                  IMAGE: matrixdotorg/synapse:develop
+                  IMAGE: ghcr.io/element-hq/synapse:develop
 
             - name: Create Pull Request
               id: cpr
diff --git a/docs/playwright.md b/docs/playwright.md
index 1d00e9781a..7eae8e783d 100644
--- a/docs/playwright.md
+++ b/docs/playwright.md
@@ -29,7 +29,7 @@ need to have Docker installed and working in order to run the Playwright tests.
 There are a few different ways to run the tests yourself. The simplest is to run:
 
 ```shell
-docker pull matrixdotorg/synapse:develop
+docker pull ghcr.io/element-hq/synapse:develop
 yarn run test:playwright
 ```
 
diff --git a/playwright/plugins/homeserver/synapse/index.ts b/playwright/plugins/homeserver/synapse/index.ts
index 65246bec6b..21c443ebd4 100644
--- a/playwright/plugins/homeserver/synapse/index.ts
+++ b/playwright/plugins/homeserver/synapse/index.ts
@@ -25,10 +25,10 @@ import { Docker } from "../../docker";
 import { HomeserverConfig, HomeserverInstance, Homeserver, StartHomeserverOpts, Credentials } from "..";
 import { randB64Bytes } from "../../utils/rand";
 
-// Docker tag to use for `matrixdotorg/synapse` image.
+// Docker tag to use for synapse docker image.
 // We target a specific digest as every now and then a Synapse update will break our CI.
 // This digest is updated by the playwright-image-updates.yaml workflow periodically.
-const DOCKER_TAG = "develop@sha256:37e50604408ec07e1add96a38c3c97559e321a9f2764bd4d132bc2fb172c73e6";
+const DOCKER_TAG = "develop@sha256:f8613aeda996b6e9c2235c8141cc8e9a65eb25ed7bcd932505e5dd3c9231b748";
 
 async function cfgDirFromTemplate(opts: StartHomeserverOpts): Promise<Omit<HomeserverConfig, "dockerUrl">> {
     const templateDir = path.join(__dirname, "templates", opts.template);
@@ -110,7 +110,7 @@ export class Synapse implements Homeserver, HomeserverInstance {
         console.log(`Starting synapse with config dir ${synCfg.configDir}...`);
         const dockerSynapseParams = ["-v", `${synCfg.configDir}:/data`, "-p", `${synCfg.port}:8008/tcp`];
         const synapseId = await this.docker.run({
-            image: `matrixdotorg/synapse:${DOCKER_TAG}`,
+            image: `ghcr.io/element-hq/synapse:${DOCKER_TAG}`,
             containerName: `react-sdk-playwright-synapse`,
             params: dockerSynapseParams,
             cmd: ["run"],