Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion common/remote-build/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ platform(
"@platforms//cpu:x86_64",
],
exec_properties = {
"container-image": "docker://docker.io/shs96c/selenium-remote-build@sha256:314b60a3c2b82f512c0f3fdba0aed8983f2b9bfdf2901a4f41511abdfd6dd74a",
"container-image": "docker://docker.io/selenium/selenium-remote-build@sha256:ca164352826812f02eaa1b4dab89adcf5b3e57deb6798dd9f15d004099db59fe",
"OSFamily": "Linux",
"dockerReuse": "True",
"dockerRunAsRoot": "False",
Expand Down
2 changes: 1 addition & 1 deletion scripts/dev-image/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Used to create a development image for working on Selenium
FROM shs96c/selenium-remote-build:latest
FROM selenium/selenium-remote-build:latest

USER root

Expand Down
11 changes: 10 additions & 1 deletion scripts/remote-image/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Our images must be for Linux x86_64
FROM --platform=linux/amd64 ubuntu:jammy@sha256:ed1544e454989078f5dec1bfdabd8c5cc9c48e0705d07b678ab6ae3fb61952d2
FROM --platform=linux/amd64 ubuntu:focal@sha256:8e5c4f0285ecbb4ead070431d29b576a530d3166df73ec44affc1cd27555141b

ENV DEBIAN_FRONTEND=noninteractive

Expand All @@ -21,6 +21,15 @@ RUN apt-get -qqy update && \
RUN apt-get update -qqy && \
apt-get install -y wget gnupg2 && \
wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key add - && echo "deb http://dl.google.com/linux/chrome/deb/ stable main" >> /etc/apt/sources.list.d/google-chrome.list && \
install -d -m 0755 /etc/apt/keyrings && \
wget -q https://packages.mozilla.org/apt/repo-signing-key.gpg -O- | tee /etc/apt/keyrings/packages.mozilla.org.asc > /dev/null && \
gpg -n -q --import --import-options import-show /etc/apt/keyrings/packages.mozilla.org.asc | awk '/pub/{getline; gsub(/^ +| +$/,""); if($0 == "35BAA0B33E9EB396F59CA838C0BA5CE6DC6315A3") print "\nThe key fingerprint matches ("$0").\n"; else print "\nVerification failed: the fingerprint ("$0") does not match the expected one.\n"}' && \
echo "deb [signed-by=/etc/apt/keyrings/packages.mozilla.org.asc] https://packages.mozilla.org/apt mozilla main" | tee -a /etc/apt/sources.list.d/mozilla.list > /dev/null && \
echo '\
Package: * \
Pin: origin packages.mozilla.org \
Pin-Priority: 1000 \
' | tee /etc/apt/preferences.d/mozilla > /dev/null && \
apt-get update -qqy && \
apt-get -qy install firefox google-chrome-stable && \
dpkg -r --force-depends firefox google-chrome-stable && \
Expand Down
2 changes: 1 addition & 1 deletion scripts/remote-image/create-cc-toolchain-within-image.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ set -eux -o pipefail
apt-get update
apt-get install -qy ca-certificates curl

curl -L -o /usr/bin/bazel https://github.com/bazelbuild/bazelisk/releases/download/v1.16.0/bazelisk-linux-amd64
curl -L -o /usr/bin/bazel https://github.com/bazelbuild/bazelisk/releases/download/v1.25.0/bazelisk-linux-amd64
chmod +x /usr/bin/bazel

temp="$(mktemp -d)"
Expand Down