CringeStudios/element-desktop
5
0
Fork 0
mirror of https://github.com/CringeStudios/element-desktop.git synced 2025-01-18 15:34:59 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Upgrade to glibc 2.28 in the Docker image for Node20 compatibility (#1391)

Browse Source
This commit is contained in:
Michael Telatynski 2023-12-18 15:38:42 +00:00 committed by GitHub
parent a7d44591aa
commit 610389244a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.github/workflows/build_linux.yaml vendored
View File

@ -91,12 +91,9 @@ jobs:
if: steps.cache.outputs.cache-hit != 'true' && inputs.arch == 'arm64' if: steps.cache.outputs.cache-hit != 'true' && inputs.arch == 'arm64'
run: | run: |
set -x set -x
sed -i 's/deb http/deb [arch=amd64] http/g' /etc/apt/sources.list
echo "deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports/ bionic main multiverse restricted universe" | tee -a /etc/apt/sources.list
echo "deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports/ bionic-updates main multiverse restricted universe" | tee -a /etc/apt/sources.list
dpkg --add-architecture arm64 dpkg --add-architecture arm64
apt-get -qq update apt-get -qq update
apt-get -qq install --no-install-recommends crossbuild-essential-arm64 libsqlcipher-dev:arm64 libssl-dev:arm64 libsecret-1-dev:arm64 libgnome-keyring-dev:arm64 apt-get -qq install --no-install-recommends crossbuild-essential-arm64 libsqlcipher-dev:arm64 libssl-dev:arm64 libsecret-1-dev:arm64
rustup target add aarch64-unknown-linux-gnu rustup target add aarch64-unknown-linux-gnu
mv dockerbuild/aarch64/.cargo . mv dockerbuild/aarch64/.cargo .
cat dockerbuild/aarch64/.env >> $GITHUB_ENV cat dockerbuild/aarch64/.env >> $GITHUB_ENV

6
dockerbuild/Dockerfile
View File

@ -1,5 +1,5 @@
# Docker image to facilitate building Element Desktop with native bits using a glibc version with broader compatibility # Docker image to facilitate building Element Desktop with native bits using a glibc version with broader compatibility
FROM buildpack-deps:bionic-curl FROM buildpack-deps:buster-curl
ENV DEBIAN_FRONTEND noninteractive ENV DEBIAN_FRONTEND noninteractive
@ -11,9 +11,9 @@ RUN apt-get -qq update && apt-get -qq dist-upgrade && \
# python for node-gyp # python for node-gyp
# rpm is required for FPM to build rpm package # rpm is required for FPM to build rpm package
# tclsh is required for building SQLite as part of SQLCipher # tclsh is required for building SQLite as part of SQLCipher
# libsecret-1-dev and libgnome-keyring-dev are required even for prebuild keytar # libsecret-1-dev is required even for prebuild keytar
apt-get -qq install --no-install-recommends qtbase5-dev bsdtar build-essential autoconf libssl-dev gcc-multilib g++-multilib lzip rpm python libcurl4 git git-lfs ssh unzip tcl \ apt-get -qq install --no-install-recommends qtbase5-dev bsdtar build-essential autoconf libssl-dev gcc-multilib g++-multilib lzip rpm python libcurl4 git git-lfs ssh unzip tcl \
libsecret-1-dev libgnome-keyring-dev \ libsecret-1-dev \
libopenjp2-tools \ libopenjp2-tools \
# Used by github actions \ # Used by github actions \
jq grep file \ jq grep file \