heierbtc/mynode
1
0
Fork 1
mirror of https://github.com/mynodebtc/mynode.git synced 2024-12-24 13:38:11 +00:00
Code Issues Projects Releases Wiki Activity

Upgrade Rust to v1.56.1; Better management of Rust and Python versions

Browse Source
This commit is contained in:
Taylor Helsper 2021-11-23 00:23:16 -06:00
parent 6a60d617f2
commit fb6190ac29
3 changed files with 66 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
rootfs/standard/usr/bin/mynode_post_upgrade.sh
View File

@ -139,6 +139,31 @@ if ! skip_base_upgrades ; then
pip2 install tzupdate virtualenv pysocks redis qrcode image subprocess32 --no-cache-dir pip2 install tzupdate virtualenv pysocks redis qrcode image subprocess32 --no-cache-dir
# Install Rust (only needed on 32-bit RPi for building some python wheels)
if [ ! -f $HOME/.cargo/env ]; then
wget https://sh.rustup.rs -O /tmp/setup_rust.sh
/bin/bash /tmp/setup_rust.sh -y --default-toolchain none
sync
fi
if [ -f $HOME/.cargo/env ]; then
# Remove old toolchains
source $HOME/.cargo/env
TOOLCHAINS=$(rustup toolchain list)
for toolchain in $TOOLCHAINS; do
if [[ "$toolchain" == *"linux"* ]] && [[ "$toolchain" != *"${RUST_VERSION}"* ]]; then
rustup toolchain remove $toolchain || true
fi
done
# Manage rust toolchains
if [ $IS_RASPI = 1 ] && [ $IS_RASPI4_ARM64 = 0 ]; then
# Install and use desired version
rustup install $RUST_VERSION
rustup default $RUST_VERSION
rustc --version
fi
fi
# Update Python3 # Update Python3
CURRENT_PYTHON3_VERSION=$(python3 --version) CURRENT_PYTHON3_VERSION=$(python3 --version)
if [[ "$CURRENT_PYTHON3_VERSION" != *"Python ${PYTHON_VERSION}"* ]]; then if [[ "$CURRENT_PYTHON3_VERSION" != *"Python ${PYTHON_VERSION}"* ]]; then
@ -149,10 +174,18 @@ if ! skip_base_upgrades ; then
wget https://www.python.org/ftp/python/${PYTHON_VERSION}/Python-${PYTHON_VERSION}.tar.xz -O python.tar.xz wget https://www.python.org/ftp/python/${PYTHON_VERSION}/Python-${PYTHON_VERSION}.tar.xz -O python.tar.xz
tar xf python.tar.xz tar xf python.tar.xz
# Build and install python
cd Python-* cd Python-*
./configure ./configure
make -j4 make -j4
make install make install
# Mark apps using python as needing re-install
rm -f /home/bitcoin/.mynode/specter_version
rm -f /home/bitcoin/.mynode/lnbits_version
rm -f /home/bitcoin/.mynode/pyblock_version
rm -f /home/bitcoin/.mynode/ckbunker_version
cd ~ cd ~
else else
echo "Python up to date" echo "Python up to date"
@ -161,7 +194,7 @@ if ! skip_base_upgrades ; then
# Install any pip3 software # Install any pip3 software
pip3 install --upgrade pip setuptools wheel pip3 install --upgrade pip setuptools wheel
pip3 install gnureadline docker-compose pipenv bcrypt pysocks redis --no-cache-dir pip3 install lnd-grpc gnureadline docker-compose pipenv bcrypt pysocks redis --no-cache-dir
pip3 install flask pam python-bitcoinrpc prometheus_client psutil transmissionrpc qrcode image --no-cache-dir pip3 install flask pam python-bitcoinrpc prometheus_client psutil transmissionrpc qrcode image --no-cache-dir
# Update Node # Update Node

5
rootfs/standard/usr/share/mynode/mynode_app_versions.sh
View File

@ -129,9 +129,14 @@ WEBSSH2_VERSION="v0.2.10-0"
WEBSSH2_VERSION_FILE=/mnt/hdd/mynode/settings/webssh2_version WEBSSH2_VERSION_FILE=/mnt/hdd/mynode/settings/webssh2_version
WEBSSH2_LATEST_VERSION_FILE=/mnt/hdd/mynode/settings/webssh2_version_latest WEBSSH2_LATEST_VERSION_FILE=/mnt/hdd/mynode/settings/webssh2_version_latest
# Dependency versions
PYTHON_VERSION="3.7.9"
NODE_JS_VERSION="14.x" NODE_JS_VERSION="14.x"
NODE_NPM_VERSION="^8.1.0" NODE_NPM_VERSION="^8.1.0"
RUST_VERSION="1.56.1"
# Check for override files # Check for override files
if [ -f /usr/share/mynode/mynode_app_versions_custom.sh ]; then if [ -f /usr/share/mynode/mynode_app_versions_custom.sh ]; then
source /usr/share/mynode/mynode_app_versions_custom.sh source /usr/share/mynode/mynode_app_versions_custom.sh

30
setup/setup_device.sh
View File

@ -225,7 +225,32 @@ pip2 install grpcio grpcio-tools googleapis-common-protos
pip2 install tzupdate virtualenv pysocks redis qrcode image subprocess32 pip2 install tzupdate virtualenv pysocks redis qrcode image subprocess32
# Update Python3 # Install Rust (only needed on 32-bit RPi for building some python wheels)
if [ ! -f $HOME/.cargo/env ]; then
wget https://sh.rustup.rs -O /tmp/setup_rust.sh
/bin/bash /tmp/setup_rust.sh -y --default-toolchain none
sync
fi
if [ -f $HOME/.cargo/env ]; then
# Remove old toolchains
source $HOME/.cargo/env
TOOLCHAINS=$(rustup toolchain list)
for toolchain in $TOOLCHAINS; do
if [[ "$toolchain" == *"linux"* ]] && [[ "$toolchain" != *"${RUST_VERSION}"* ]]; then
rustup toolchain remove $toolchain || true
fi
done
# Manage rust toolchains
if [ $IS_RASPI = 1 ] && [ $IS_RASPI4_ARM64 = 0 ]; then
# Install and use desired version
rustup install $RUST_VERSION
rustup default $RUST_VERSION
rustc --version
fi
fi
# Install Python3 (latest)
CURRENT_PYTHON3_VERSION=$(python3 --version) CURRENT_PYTHON3_VERSION=$(python3 --version)
if [[ "$CURRENT_PYTHON3_VERSION" != *"Python ${PYTHON_VERSION}"* ]]; then if [[ "$CURRENT_PYTHON3_VERSION" != *"Python ${PYTHON_VERSION}"* ]]; then
mkdir -p /opt/download mkdir -p /opt/download
@ -247,8 +272,7 @@ fi
# Install Python3 specific tools (run multiple times to make sure success) # Install Python3 specific tools (run multiple times to make sure success)
pip3 install --upgrade pip wheel setuptools pip3 install --upgrade pip wheel setuptools
pip3 install bitstring lnd-grpc pycoin aiohttp connectrum python-bitcoinlib pip3 install lnd-grpc gnureadline docker-compose pipenv bcrypt pysocks redis --no-cache-dir
pip3 install gnureadline docker-compose pipenv bcrypt pysocks redis --no-cache-dir
pip3 install flask pam python-bitcoinrpc prometheus_client psutil transmissionrpc qrcode image --no-cache-dir pip3 install flask pam python-bitcoinrpc prometheus_client psutil transmissionrpc qrcode image --no-cache-dir