From 245b07241322a6cc99b23f9b651d6ea671487824 Mon Sep 17 00:00:00 2001
From: David Colburn <xero73@gmail.com>
Date: Thu, 20 Jun 2024 22:53:43 -0700
Subject: [PATCH] Chrome 125 (#706)

* chrome 125

* update magefile

* remove version from install script
---
 build/chrome/install-chrome   |  2 +-
 build/chrome/scripts/amd64.sh |  2 +-
 build/egress/Dockerfile       |  2 +-
 build/test/Dockerfile         |  2 +-
 magefile.go                   | 19 +------------------
 5 files changed, 5 insertions(+), 22 deletions(-)

diff --git a/build/chrome/install-chrome b/build/chrome/install-chrome
index 2a19ec49..55e4014b 100755
--- a/build/chrome/install-chrome
+++ b/build/chrome/install-chrome
@@ -43,7 +43,7 @@ then
   chown root:root /usr/local/sbin/chrome-devel-sandbox
   chmod 4755 /usr/local/sbin/chrome-devel-sandbox
 else
-  apt-get install -y /chrome-installer/amd64/google-chrome-stable_124.0.6367.201-1_amd64.deb
+  apt-get install -y /chrome-installer/amd64/google-chrome-stable_amd64.deb
   chmod +x /chrome-installer/amd64/chromedriver-linux64/chromedriver
   mv -f /chrome-installer/amd64/chromedriver-linux64/chromedriver /usr/local/bin/chromedriver
 fi
diff --git a/build/chrome/scripts/amd64.sh b/build/chrome/scripts/amd64.sh
index 66e79cab..d288b840 100644
--- a/build/chrome/scripts/amd64.sh
+++ b/build/chrome/scripts/amd64.sh
@@ -3,4 +3,4 @@ set -xeuo pipefail
 
 wget https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_"$1"-1_amd64.deb
 mkdir -p "$HOME/output/amd64"
-mv google-chrome-stable_"$1"-1_amd64.deb "$HOME/output/amd64"
+mv google-chrome-stable_"$1"-1_amd64.deb "$HOME/output/amd64/google-chrome-stable_amd64.deb"
diff --git a/build/egress/Dockerfile b/build/egress/Dockerfile
index c595a736..6171c2eb 100644
--- a/build/egress/Dockerfile
+++ b/build/egress/Dockerfile
@@ -68,7 +68,7 @@ RUN apt-get update && \
     gstreamer1.0-plugins-base-
 
 # install chrome
-COPY --from=livekit/chrome-installer:124.0.6367.201.1 /chrome-installer /chrome-installer
+COPY --from=livekit/chrome-installer:125.0.6422.141 /chrome-installer /chrome-installer
 RUN /chrome-installer/install-chrome "$TARGETPLATFORM"
 
 # clean up
diff --git a/build/test/Dockerfile b/build/test/Dockerfile
index 8aeb6bea..c76f186e 100644
--- a/build/test/Dockerfile
+++ b/build/test/Dockerfile
@@ -73,7 +73,7 @@ RUN if [ "$TARGETPLATFORM" = "linux/arm64" ]; then GOARCH=arm64; else GOARCH=amd
 ENV PATH="/usr/local/go/bin:${PATH}"
 
 # install chrome
-COPY --from=livekit/chrome-installer:124.0.6367.201.1 /chrome-installer /chrome-installer
+COPY --from=livekit/chrome-installer:125.0.6422.141 /chrome-installer /chrome-installer
 RUN /chrome-installer/install-chrome "$TARGETPLATFORM"
 
 # clean up
diff --git a/magefile.go b/magefile.go
index 4170c098..1a4ff913 100644
--- a/magefile.go
+++ b/magefile.go
@@ -31,7 +31,7 @@ import (
 const (
 	gstVersion      = "1.22.12"
 	libniceVersion  = "0.1.21"
-	chromiumVersion = "124.0.6367.201"
+	chromiumVersion = "125.0.6422.141"
 	dockerBuild     = "docker build"
 	dockerBuildX    = "docker buildx build --push --platform linux/amd64,linux/arm64"
 )
@@ -165,23 +165,6 @@ func Build() error {
 	)
 }
 
-func BuildChrome() error {
-	return mageutil.Run(context.Background(),
-		"docker pull ubuntu:22.04",
-		"docker build -t livekit/chrome-installer ./build/chrome",
-	)
-}
-
-func PublishChrome() error {
-	return mageutil.Run(context.Background(),
-		"docker pull ubuntu:22.04",
-		fmt.Sprintf(
-			"%s -t livekit/chrome-installer:%s ./build/chrome",
-			dockerBuildX, chromiumVersion,
-		),
-	)
-}
-
 func BuildTemplate() error {
 	return mageutil.Run(context.Background(),
 		"docker pull ubuntu:22.04",