Skip to content

Commit

Permalink
Chrome 125 (#706)
Browse files Browse the repository at this point in the history
* chrome 125

* update magefile

* remove version from install script
  • Loading branch information
frostbyte73 authored Jun 21, 2024
1 parent cd077eb commit 245b072
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 22 deletions.
2 changes: 1 addition & 1 deletion build/chrome/install-chrome
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion build/chrome/scripts/amd64.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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"
2 changes: 1 addition & 1 deletion build/egress/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion build/test/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
19 changes: 1 addition & 18 deletions magefile.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down Expand Up @@ -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",
Expand Down

0 comments on commit 245b072

Please sign in to comment.