mirror of
https://github.com/cryptoadvance/specter-desktop.git
synced 2026-08-13 12:33:29 +02:00
Chore: port uiux/fixes/release_process to master (#2114)
* upgrading python and electron/-builder * python on top of focal based electron-builder #2118 * adding necessary python build dependencies
This commit is contained in:
k9ert
GitHub
parent
e52daf5ba4
commit
eb7f094626
4 changed files with 2855 additions and 2424 deletions
39
docker/electron-builder-master/README.md
Normal file
39
docker/electron-builder-master/README.md
Normal file
|
|
@ -0,0 +1,39 @@
|
|||
# Purpose
|
||||
|
||||
Used for building the electron-app. In short it's the /pyinstaller/build-unix.sh script which is running in this image.
|
||||
|
||||
By intention, this is using an older OS-version in order to avoid glibc-issues. For details, see:
|
||||
* https://github.com/cryptoadvance/specter-desktop/pull/1688#issuecomment-1242796681
|
||||
* https://github.com/cryptoadvance/specter-desktop/issues/373#issuecomment-695068924
|
||||
|
||||
|
||||
# Usage
|
||||
|
||||
If you want to run the image manually, do something like this (copied from [here](https://www.electron.build/multi-platform-build#build-electron-app-using-docker-on-a-local-machine)):
|
||||
|
||||
|
||||
```
|
||||
docker run --rm -ti \
|
||||
--env-file <(env | grep -iE 'DEBUG|NODE_|ELECTRON_|YARN_|NPM_|CI|CIRCLE|TRAVIS_TAG|TRAVIS|TRAVIS_REPO_|TRAVIS_BUILD_|TRAVIS_BRANCH|TRAVIS_PULL_REQUEST_|APPVEYOR_|CSC_|GH_|GITHUB_|BT_|AWS_|STRIP|BUILD_') \
|
||||
--env ELECTRON_CACHE="/root/.cache/electron" \
|
||||
--env ELECTRON_BUILDER_CACHE="/root/.cache/electron-builder" \
|
||||
-v ${PWD}:/project \
|
||||
-v ${PWD##*/}-node-modules:/project/node_modules \
|
||||
-v ~/.cache/electron:/root/.cache/electron \
|
||||
-v ~/.cache/electron-builder:/root/.cache/electron-builder \
|
||||
electronuserland/builder:wine
|
||||
```
|
||||
|
||||
|
||||
# Building
|
||||
|
||||
build the image like:
|
||||
|
||||
```
|
||||
docker build -t registry.gitlab.com/cryptoadvance/specter-desktop/electron-builder:latest .
|
||||
docker push registry.gitlab.com/cryptoadvance/specter-desktop/electron-builder:latest
|
||||
```
|
||||
|
||||
# Details
|
||||
|
||||
This image is putting python3.10 on top of electronuserland/builder:wine. As we want to have stable build-targets the actual `FROM` clause is `electronuserland/builder:14-wine-10.22` as the project is adding the node version (14) and a timestamp (10.22) to the tagname.
|
||||
|
|
@ -1,4 +1,188 @@
|
|||
FROM electronuserland/builder:wine
|
||||
FROM electronuserland/builder:14-wine-10.22
|
||||
# 14-wine-10.22 is a stable tag which has been the same than the "wine" tag but more explicit
|
||||
# It's based on node 14 and focal and therefore has glibc 2.31.
|
||||
# It has been created on Oct 22
|
||||
|
||||
RUN apt-get update && apt-get install -y python3.8 python3.8-dev python3-pip zip unzip file apt libusb-1.0-0-dev libudev-dev
|
||||
RUN update-alternatives --install /usr/bin/python3 python3 /usr/bin/python3.8 1
|
||||
# Let's put python3.10 on top:
|
||||
# * electronuserland/builder:14-wine-10.22 is same as wine which depends on "node"
|
||||
# * which depends on "base" which builds on buildpack-deps:focal curl
|
||||
# https://github.com/docker-library/buildpack-deps/blob/98a5ab81d47a106c458cdf90733df0ee8beea06c/ubuntu/focal/curl/Dockerfile
|
||||
# * now the coe below to install python is copied from:
|
||||
# https://github.com/docker-library/python/blob/master/3.10/bullseye/Dockerfile
|
||||
# which builds ontop of buildpack-deps:bullseye-scm
|
||||
# * So to make the python installation fully functional, we have to install some stuff ...
|
||||
# * and then do the python installation
|
||||
|
||||
|
||||
# Copying some stuff from https://github.com/docker-library/python/blob/master/3.10/bullseye/Dockerfile
|
||||
|
||||
RUN set -ex; \
|
||||
apt-get update; \
|
||||
apt-get install -y --no-install-recommends \
|
||||
autoconf \
|
||||
automake \
|
||||
bzip2 \
|
||||
dpkg-dev \
|
||||
file \
|
||||
g++ \
|
||||
gcc \
|
||||
imagemagick \
|
||||
libbz2-dev \
|
||||
libc6-dev \
|
||||
libcurl4-openssl-dev \
|
||||
libdb-dev \
|
||||
libevent-dev \
|
||||
libffi-dev \
|
||||
libgdbm-dev \
|
||||
libglib2.0-dev \
|
||||
libgmp-dev \
|
||||
libjpeg-dev \
|
||||
libkrb5-dev \
|
||||
liblzma-dev \
|
||||
libmagickcore-dev \
|
||||
libmagickwand-dev \
|
||||
libmaxminddb-dev \
|
||||
libncurses5-dev \
|
||||
libncursesw5-dev \
|
||||
libpng-dev \
|
||||
libpq-dev \
|
||||
libreadline-dev \
|
||||
libsqlite3-dev \
|
||||
libssl-dev \
|
||||
libtool \
|
||||
libwebp-dev \
|
||||
libxml2-dev \
|
||||
libxslt-dev \
|
||||
libyaml-dev \
|
||||
make \
|
||||
patch \
|
||||
unzip \
|
||||
zip \
|
||||
jq \
|
||||
xz-utils \
|
||||
zlib1g-dev
|
||||
|
||||
|
||||
# This has been copied from:
|
||||
# https://github.com/docker-library/python/blob/master/3.10/bullseye/Dockerfile
|
||||
|
||||
|
||||
# ensure local python is preferred over distribution python
|
||||
ENV PATH /usr/local/bin:$PATH
|
||||
|
||||
# http://bugs.python.org/issue19846
|
||||
# > At the moment, setting "LANG=C" on a Linux system *fundamentally breaks Python 3*, and that's not OK.
|
||||
ENV LANG C.UTF-8
|
||||
|
||||
# runtime dependencies
|
||||
RUN set -eux; \
|
||||
apt-get update; \
|
||||
apt-get install -y --no-install-recommends \
|
||||
libbluetooth-dev \
|
||||
tk-dev \
|
||||
uuid-dev \
|
||||
; \
|
||||
rm -rf /var/lib/apt/lists/*
|
||||
|
||||
ENV GPG_KEY A035C8C19219BA821ECEA86B64E628F8D684696D
|
||||
ENV PYTHON_VERSION 3.10.9
|
||||
|
||||
RUN set -eux; \
|
||||
\
|
||||
savedAptMark="$(apt-mark showmanual)"; \
|
||||
apt-get update; \
|
||||
apt-get install -y --no-install-recommends \
|
||||
patchelf \
|
||||
; \
|
||||
\
|
||||
wget -O python.tar.xz "https://www.python.org/ftp/python/${PYTHON_VERSION%%[a-z]*}/Python-$PYTHON_VERSION.tar.xz"; \
|
||||
wget -O python.tar.xz.asc "https://www.python.org/ftp/python/${PYTHON_VERSION%%[a-z]*}/Python-$PYTHON_VERSION.tar.xz.asc"; \
|
||||
GNUPGHOME="$(mktemp -d)"; export GNUPGHOME; \
|
||||
gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$GPG_KEY"; \
|
||||
gpg --batch --verify python.tar.xz.asc python.tar.xz; \
|
||||
command -v gpgconf > /dev/null && gpgconf --kill all || :; \
|
||||
rm -rf "$GNUPGHOME" python.tar.xz.asc; \
|
||||
mkdir -p /usr/src/python; \
|
||||
tar --extract --directory /usr/src/python --strip-components=1 --file python.tar.xz; \
|
||||
rm python.tar.xz; \
|
||||
\
|
||||
cd /usr/src/python; \
|
||||
gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \
|
||||
./configure \
|
||||
--build="$gnuArch" \
|
||||
--enable-loadable-sqlite-extensions \
|
||||
--enable-optimizations \
|
||||
--enable-option-checking=fatal \
|
||||
--enable-shared \
|
||||
--with-lto \
|
||||
--with-system-expat \
|
||||
--without-ensurepip \
|
||||
; \
|
||||
nproc="$(nproc)"; \
|
||||
make -j "$nproc" \
|
||||
; \
|
||||
make install; \
|
||||
\
|
||||
# https://github.com/docker-library/python/issues/784
|
||||
# prevent accidental usage of a system installed libpython of the same version
|
||||
bin="$(readlink -vf /usr/local/bin/python3)"; \
|
||||
patchelf --set-rpath '$ORIGIN/../lib' "$bin"; \
|
||||
\
|
||||
# enable GDB to load debugging data: https://github.com/docker-library/python/pull/701
|
||||
dir="$(dirname "$bin")"; \
|
||||
mkdir -p "/usr/share/gdb/auto-load/$dir"; \
|
||||
cp -vL Tools/gdb/libpython.py "/usr/share/gdb/auto-load/$bin-gdb.py"; \
|
||||
\
|
||||
cd /; \
|
||||
rm -rf /usr/src/python; \
|
||||
\
|
||||
find /usr/local -depth \
|
||||
\( \
|
||||
\( -type d -a \( -name test -o -name tests -o -name idle_test \) \) \
|
||||
-o \( -type f -a \( -name '*.pyc' -o -name '*.pyo' -o -name 'libpython*.a' \) \) \
|
||||
\) -exec rm -rf '{}' + \
|
||||
; \
|
||||
\
|
||||
ldconfig; \
|
||||
\
|
||||
apt-mark auto '.*' > /dev/null; \
|
||||
apt-mark manual $savedAptMark; \
|
||||
apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
|
||||
rm -rf /var/lib/apt/lists/*; \
|
||||
\
|
||||
python3 --version
|
||||
|
||||
# make some useful symlinks that are expected to exist ("/usr/local/bin/python" and friends)
|
||||
RUN set -eux; \
|
||||
for src in idle3 pydoc3 python3 python3-config; do \
|
||||
dst="$(echo "$src" | tr -d 3)"; \
|
||||
[ -s "/usr/local/bin/$src" ]; \
|
||||
[ ! -e "/usr/local/bin/$dst" ]; \
|
||||
ln -svT "$src" "/usr/local/bin/$dst"; \
|
||||
done
|
||||
|
||||
# if this is called "PIP_VERSION", pip explodes with "ValueError: invalid truth value '<VERSION>'"
|
||||
ENV PYTHON_PIP_VERSION 22.3.1
|
||||
# https://github.com/docker-library/python/issues/365
|
||||
ENV PYTHON_SETUPTOOLS_VERSION 65.5.1
|
||||
# https://github.com/pypa/get-pip
|
||||
ENV PYTHON_GET_PIP_URL https://github.com/pypa/get-pip/raw/1a96dc5acd0303c4700e02655aefd3bc68c78958/public/get-pip.py
|
||||
ENV PYTHON_GET_PIP_SHA256 d1d09b0f9e745610657a528689ba3ea44a73bd19c60f4c954271b790c71c2653
|
||||
|
||||
RUN set -eux; \
|
||||
\
|
||||
wget -O get-pip.py "$PYTHON_GET_PIP_URL"; \
|
||||
echo "$PYTHON_GET_PIP_SHA256 *get-pip.py" | sha256sum -c -; \
|
||||
\
|
||||
export PYTHONDONTWRITEBYTECODE=1; \
|
||||
\
|
||||
python get-pip.py \
|
||||
--disable-pip-version-check \
|
||||
--no-cache-dir \
|
||||
--no-compile \
|
||||
"pip==$PYTHON_PIP_VERSION" \
|
||||
"setuptools==$PYTHON_SETUPTOOLS_VERSION" \
|
||||
; \
|
||||
rm -f get-pip.py; \
|
||||
\
|
||||
pip --version
|
||||
5046
pyinstaller/electron/package-lock.json
generated
5046
pyinstaller/electron/package-lock.json
generated
File diff suppressed because it is too large
Load diff
|
|
@ -19,8 +19,8 @@
|
|||
"author": "Specter",
|
||||
"license": "MIT",
|
||||
"devDependencies": {
|
||||
"electron": "^13.6.9",
|
||||
"electron-builder": "^22.9.1"
|
||||
"electron": "^22.1.0",
|
||||
"electron-builder": "^23.3.1"
|
||||
},
|
||||
"build": {
|
||||
"productName": "Specter",
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue