diff --git a/.github/.devcontainer/chromium/devcontainer-feature.json b/.github/.devcontainer/chrome/devcontainer-feature.json similarity index 60% rename from .github/.devcontainer/chromium/devcontainer-feature.json rename to .github/.devcontainer/chrome/devcontainer-feature.json index 28df9d3..e78f5d3 100644 --- a/.github/.devcontainer/chromium/devcontainer-feature.json +++ b/.github/.devcontainer/chrome/devcontainer-feature.json @@ -1,8 +1,8 @@ { - "id": "chromium", + "id": "chrome", "version": "1.0.0", - "name": "Chromium", - "description": "Install Chromium web browser.", + "name": "Chrome", + "description": "Install Google Chrome web browser.", "installsAfter": [ "ghcr.io/devcontainers/features/common-utils", "ghcr.io/devcontainers/features/git" diff --git a/.github/.devcontainer/chromium/install.sh b/.github/.devcontainer/chrome/install.sh similarity index 64% rename from .github/.devcontainer/chromium/install.sh rename to .github/.devcontainer/chrome/install.sh index a3e29af..aa49500 100755 --- a/.github/.devcontainer/chromium/install.sh +++ b/.github/.devcontainer/chrome/install.sh @@ -51,7 +51,24 @@ check_packages() { fi } -check_packages chromium-browser +install_chrome() { + local arch="$1" + check_packages curl gnupg + curl -fSsL https://dl.google.com/linux/linux_signing_key.pub | gpg --dearmor | tee /usr/share/keyrings/google-chrome.gpg >>/dev/null + echo deb [arch=${arch} signed-by=/usr/share/keyrings/google-chrome.gpg] http://dl.google.com/linux/chrome/deb/ stable main | tee /etc/apt/sources.list.d/google-chrome.list + apt_get_update + check_packages google-chrome-stable +} + +install_chrome2() { + local arch="$1" + wget -q -O - https://dl.google.com/linux/linux_signing_key.pub | sudo apt-key add - + echo "deb [arch=${arch}] http://dl.google.com/linux/chrome/deb/ stable main" | sudo tee /etc/apt/sources.list.d/google-chrome.list + apt_get_update + check_packages google-chrome-stable +} + +install_chrome ${arch} apt-get clean && rm -rf /var/lib/apt/lists/* diff --git a/.github/.devcontainer/decktape/devcontainer-feature.json b/.github/.devcontainer/decktape/devcontainer-feature.json index 41b60e4..e123b93 100644 --- a/.github/.devcontainer/decktape/devcontainer-feature.json +++ b/.github/.devcontainer/decktape/devcontainer-feature.json @@ -14,6 +14,6 @@ "installsAfter": [ "ghcr.io/devcontainers/features/common-utils", "ghcr.io/devcontainers/features/git", - "./chromium" + "./chrome" ] } diff --git a/.github/.devcontainer/devcontainer.json b/.github/.devcontainer/devcontainer.json index cec125a..b6cda0e 100644 --- a/.github/.devcontainer/devcontainer.json +++ b/.github/.devcontainer/devcontainer.json @@ -45,7 +45,7 @@ "./uv": { "version": "latest" }, - "./chromium": {}, + "./chrome": {}, "./decktape": { "node": "22" },