From 2231b7a5a6bb0519c16d9a155fc3ba29ca9b80e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Sun, 30 Mar 2025 19:47:00 +0200 Subject: [PATCH] make vivaldi cross-arch. --- apps/vivaldi/Dockerfile | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/apps/vivaldi/Dockerfile b/apps/vivaldi/Dockerfile index b5fa22d6..9ac964d8 100644 --- a/apps/vivaldi/Dockerfile +++ b/apps/vivaldi/Dockerfile @@ -1,15 +1,14 @@ ARG BASE_IMAGE=m1k1o/neko:base FROM $BASE_IMAGE -ARG VIVALDI_VERSION="5.3.2679.34-1" -# TODO: Get chromium version from vivaldi -ARG CHROMIUM_VERSION="102.0.5005.72" +ARG VIVALDI_VERSION="7.3.3635.4-1" # # install vivaldi SHELL ["/bin/bash", "-c"] RUN set -eux; apt-get update; \ - wget -O /tmp/vivaldi.deb "https://downloads.vivaldi.com/stable/vivaldi-stable_${VIVALDI_VERSION}_amd64.deb"; \ + ARCH=$(dpkg --print-architecture); \ + wget -O /tmp/vivaldi.deb "https://downloads.vivaldi.com/stable/vivaldi-stable_${VIVALDI_VERSION}_${ARCH}.deb"; \ apt-get install -y --no-install-recommends wget unzip xz-utils jq openbox /tmp/vivaldi.deb; \ /opt/vivaldi/update-ffmpeg; \ # @@ -22,7 +21,7 @@ RUN set -eux; apt-get update; \ mkdir -p "${EXTENSIONS_DIR}"; \ for EXT_ID in "${EXTENSIONS[@]}"; \ do \ - EXT_URL="https://clients2.google.com/service/update2/crx?response=redirect&nacl_arch=x86-64&prodversion=${CHROMIUM_VERSION}&acceptformat=crx2,crx3&x=id%3D${EXT_ID}%26installsource%3Dondemand%26uc"; \ + EXT_URL="https://clients2.google.com/service/update2/crx?response=redirect&prodversion=100&acceptformat=crx2,crx3&x=id%3D${EXT_ID}%26installsource%3Dondemand%26uc"; \ EXT_PATH="${EXTENSIONS_DIR}/${EXT_ID}.crx"; \ wget -O "${EXT_PATH}" "${EXT_URL}"; \ EXT_VERSION="$(unzip -p "${EXT_PATH}" manifest.json 2>/dev/null | jq -r ".version")"; \