From 02c9d3f9c29f3c58148cfa32e9cd5d48a2966aed Mon Sep 17 00:00:00 2001
From: halfwhole <41856541+halfwhole@users.noreply.github.com>
Date: Thu, 5 Sep 2024 16:04:28 +0800
Subject: [PATCH] build: fix link to ibm plex sans font (#2341)

---
 .gitpod.Dockerfile | 4 ++--
 Dockerfile         | 2 +-
 Dockerfile.dev     | 2 +-
 package.json       | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.gitpod.Dockerfile b/.gitpod.Dockerfile
index 7752c4db9..b88a4c49c 100644
--- a/.gitpod.Dockerfile
+++ b/.gitpod.Dockerfile
@@ -9,8 +9,8 @@ RUN sudo apt-get update \
 RUN sudo mkdir -p /docker-entrypoint-initaws.d
 RUN sudo chown gitpod /docker-entrypoint-initaws.d
 
-# Installs IBMPlexSans-Regular.ttf for QRCodeService.
-RUN sudo wget https://github.com/IBM/plex/blob/master/IBM-Plex-Sans/fonts/complete/ttf/IBMPlexSans-Regular.ttf?raw=true -O /usr/share/fonts/truetype/IBMPlexSans-Regular.ttf
+# Installs IBMPlexSans-Regular.otf for QRCodeService.
+RUN sudo wget https://github.com/IBM/plex/blob/master/packages/plex-sans/fonts/complete/otf/IBMPlexSans-Regular.otf?raw=true -O /usr/share/fonts/truetype/IBMPlexSans-Regular.otf
 RUN sudo fc-cache -f
 
 USER gitpod
diff --git a/Dockerfile b/Dockerfile
index fa4eeb55d..7ac94b88c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -23,7 +23,7 @@ EXPOSE 3000
 RUN apk update && apk add font-freefont && rm -rf /var/cache/apk/*
 
 # Installs IBMPlexSans-Regular.otf for QRCodeService.
-RUN wget https://github.com/IBM/plex/blob/master/IBM-Plex-Sans/fonts/complete/otf/IBMPlexSans-Regular.otf?raw=true -O /usr/share/fonts/freefont/IBMPlexSans-Regular.otf
+RUN wget https://github.com/IBM/plex/blob/master/packages/plex-sans/fonts/complete/otf/IBMPlexSans-Regular.otf?raw=true -O /usr/share/fonts/freefont/IBMPlexSans-Regular.otf
 RUN fc-cache -f
 
 # Install libraries
diff --git a/Dockerfile.dev b/Dockerfile.dev
index f866f7885..895ce2832 100644
--- a/Dockerfile.dev
+++ b/Dockerfile.dev
@@ -13,7 +13,7 @@ EXPOSE 3000
 RUN apk update && apk add font-freefont && rm -rf /var/cache/apk/*
 
 # Installs IBMPlexSans-Regular.otf for QRCodeService.
-RUN wget https://github.com/IBM/plex/blob/master/IBM-Plex-Sans/fonts/complete/otf/IBMPlexSans-Regular.otf?raw=true -O /usr/share/fonts/freefont/IBMPlexSans-Regular.otf
+RUN wget https://github.com/IBM/plex/blob/master/packages/plex-sans/fonts/complete/otf/IBMPlexSans-Regular.otf?raw=true -O /usr/share/fonts/freefont/IBMPlexSans-Regular.otf
 RUN fc-cache -f
 
 # Install libraries
diff --git a/package.json b/package.json
index 099c6a774..35f4b3c03 100644
--- a/package.json
+++ b/package.json
@@ -17,7 +17,7 @@
     "client-dev": "webpack serve --mode development --host 0.0.0.0 --devtool inline-source-map --hot",
     "server-dev": "ts-node-dev --poll --respawn --transpile-only --inspect=0.0.0.0 -r dotenv/config -- src/server/index.ts",
     "docker-dev": "concurrently \"npm run server-dev\" \"npm run client-dev\"",
-    "dev": "docker-compose -f docker-compose.yml up --build",
+    "dev": "docker compose -f docker-compose.yml up --build",
     "test": "jest --collectCoverage",
     "test:ci": "jest --coverage && coveralls < coverage/lcov.info",
     "test:e2e": "testcafe chrome ./test/end-to-end --app \"npm run dev\" --app-init-delay 270000",