3pp-mirror/neko
1
0
Fork 0
mirror of https://github.com/m1k1o/neko.git synced 2025-08-06 10:20:26 +02:00
Code Issues Projects Releases Packages Wiki Activity

fix amd64 & build.

Browse source
This commit is contained in:
Miroslav Šedivý 2025-03-30 16:16:58 +02:00
parent a377f0f9f2
commit 4ab3dccc7f
3 changed files with 10 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

4
apps/chromium/Dockerfile
View file

@ -8,10 +8,10 @@ RUN set -eux; \
apt-get update; \ apt-get update; \
apt-get install -y --no-install-recommends chromium chromium-common chromium-sandbox openbox; \ apt-get install -y --no-install-recommends chromium chromium-common chromium-sandbox openbox; \
# #
# install widevine module (only for x86_64) # install widevine module (only for amd64)
CHROMIUM_DIR="/usr/lib/chromium"; \ CHROMIUM_DIR="/usr/lib/chromium"; \
ARCH=$(dpkg --print-architecture); \ ARCH=$(dpkg --print-architecture); \
if [ "${ARCH}" = "x86_64" ]; then \ if [ "${ARCH}" = "amd64" ]; then \
# https://commondatastorage.googleapis.com/chromeos-localmirror/distfiles/chromeos-lacros-arm64-squash-zstd-120.0.6098.0 # https://commondatastorage.googleapis.com/chromeos-localmirror/distfiles/chromeos-lacros-arm64-squash-zstd-120.0.6098.0
apt-get install -y --no-install-recommends unzip; \ apt-get install -y --no-install-recommends unzip; \
WIDEVINE_ARCH="x64"; \ WIDEVINE_ARCH="x64"; \

8
apps/firefox/Dockerfile
View file

@ -9,7 +9,7 @@ RUN set -eux; apt-get update; \
if [ "${ARCH}" = "armhf" ]; then \ if [ "${ARCH}" = "armhf" ]; then \
# #
# install firefox-esr for armhf # install firefox-esr for armhf
apt-get install -y --no-install-recommends openbox firefox-esr; \ apt-get install -y --no-install-recommends firefox-esr; \
ln -s /usr/bin/firefox-esr /usr/bin/firefox; \ ln -s /usr/bin/firefox-esr /usr/bin/firefox; \
# #
# install extensions # install extensions
@ -18,11 +18,11 @@ RUN set -eux; apt-get update; \
wget -O '/usr/lib/firefox-esr/distribution/extensions/sponsorBlocker@ajay.app.xpi' https://addons.mozilla.org/firefox/downloads/latest/sponsorblock/latest.xpi; \ wget -O '/usr/lib/firefox-esr/distribution/extensions/sponsorBlocker@ajay.app.xpi' https://addons.mozilla.org/firefox/downloads/latest/sponsorblock/latest.xpi; \
else \ else \
# #
# fetch latest release (for x86_64 and arm64) # fetch latest release (for amd64 and arm64)
if [ "${ARCH}" = "x86_64" ]; then \ if [ "${ARCH}" = "amd64" ]; then \
SRC_URL="https://download.mozilla.org/?product=firefox-latest&os=linux64&lang=en-US"; \ SRC_URL="https://download.mozilla.org/?product=firefox-latest&os=linux64&lang=en-US"; \
elif [ "${ARCH}" = "arm64" ]; then \ elif [ "${ARCH}" = "arm64" ]; then \
SRC_URL="https://download.mozilla.org/?product=firefox-latest&os=linux-aarch64&lang=en-US"; \ SRC_URL="https://download.mozilla.org/?product=firefox-latest&os=linux64-aarch64&lang=en-US"; \
fi; \ fi; \
if [ ! -z "${SRC_URL}" ]; then \ if [ ! -z "${SRC_URL}" ]; then \
apt-get install -y --no-install-recommends xz-utils libgtk-3-0 libdbus-glib-1-2; \ apt-get install -y --no-install-recommends xz-utils libgtk-3-0 libdbus-glib-1-2; \

13
build
View file

@ -283,14 +283,9 @@ fi
prompt "Are you sure you want to build $BASE_IMAGE?" prompt "Are you sure you want to build $BASE_IMAGE?"
if [ -z "$FLAVOR" ]; then RUNTIME_DOCKERFILE="Dockerfile"
export RUNTIME_DOCKERFILE="Dockerfile" if [ ! -z "$FLAVOR" ] && [ -f "runtime/Dockerfile.$FLAVOR" ]; then
else RUNTIME_DOCKERFILE="Dockerfile.$FLAVOR"
if [ -f "runtime/Dockerfile.$FLAVOR" ]; then
export RUNTIME_DOCKERFILE="Dockerfile.$FLAVOR"
else
export RUNTIME_DOCKERFILE="Dockerfile"
fi
fi fi
log "Building base image: $BASE_IMAGE" log "Building base image: $BASE_IMAGE"
@ -301,4 +296,4 @@ docker run --rm -i \
--entrypoint go \ --entrypoint go \
golang:1.24-bullseye \ golang:1.24-bullseye \
run ./docker/main.go \ run ./docker/main.go \
-i Dockerfile.tmpl | build_image $BASE_IMAGE -f - . -i Dockerfile.tmpl -client $CLIENT_DIST | build_image $BASE_IMAGE -f - .