make vivaldi cross-arch.
This commit is contained in:
parent
92ccd2d2d1
commit
2231b7a5a6
1 changed files with 4 additions and 5 deletions
|
|
@ -1,15 +1,14 @@
|
||||||
ARG BASE_IMAGE=m1k1o/neko:base
|
ARG BASE_IMAGE=m1k1o/neko:base
|
||||||
FROM $BASE_IMAGE
|
FROM $BASE_IMAGE
|
||||||
|
|
||||||
ARG VIVALDI_VERSION="5.3.2679.34-1"
|
ARG VIVALDI_VERSION="7.3.3635.4-1"
|
||||||
# TODO: Get chromium version from vivaldi
|
|
||||||
ARG CHROMIUM_VERSION="102.0.5005.72"
|
|
||||||
|
|
||||||
#
|
#
|
||||||
# install vivaldi
|
# install vivaldi
|
||||||
SHELL ["/bin/bash", "-c"]
|
SHELL ["/bin/bash", "-c"]
|
||||||
RUN set -eux; apt-get update; \
|
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; \
|
apt-get install -y --no-install-recommends wget unzip xz-utils jq openbox /tmp/vivaldi.deb; \
|
||||||
/opt/vivaldi/update-ffmpeg; \
|
/opt/vivaldi/update-ffmpeg; \
|
||||||
#
|
#
|
||||||
|
|
@ -22,7 +21,7 @@ RUN set -eux; apt-get update; \
|
||||||
mkdir -p "${EXTENSIONS_DIR}"; \
|
mkdir -p "${EXTENSIONS_DIR}"; \
|
||||||
for EXT_ID in "${EXTENSIONS[@]}"; \
|
for EXT_ID in "${EXTENSIONS[@]}"; \
|
||||||
do \
|
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"; \
|
EXT_PATH="${EXTENSIONS_DIR}/${EXT_ID}.crx"; \
|
||||||
wget -O "${EXT_PATH}" "${EXT_URL}"; \
|
wget -O "${EXT_PATH}" "${EXT_URL}"; \
|
||||||
EXT_VERSION="$(unzip -p "${EXT_PATH}" manifest.json 2>/dev/null | jq -r ".version")"; \
|
EXT_VERSION="$(unzip -p "${EXT_PATH}" manifest.json 2>/dev/null | jq -r ".version")"; \
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue