Lock Dojo at v1.14.0 for RP4 32-bit

This commit is contained in:
Taylor Helsper 2022-06-01 21:31:06 -05:00
parent 1a316df182
commit 45d579b648
3 changed files with 16 additions and 1 deletions

View File

@ -219,7 +219,9 @@ while true; do
# Fix for v1.12.1 (may need to remove later) # Fix for v1.12.1 (may need to remove later)
docker rmi node:14-alpine || true docker rmi node:14-alpine || true
sed -i "s/node:14-alpine.*/node:14-alpine3.12/g" /mnt/hdd/mynode/dojo/docker/my-dojo/node/Dockerfile if [ "$IS_32_BIT" = "1" ]; then
sed -i "s/node:14-alpine.*/node:14-alpine3.12/g" /mnt/hdd/mynode/dojo/docker/my-dojo/node/Dockerfile
fi
# Run Dojo Install or Upgrade # Run Dojo Install or Upgrade
cd /mnt/hdd/mynode/dojo/docker/my-dojo cd /mnt/hdd/mynode/dojo/docker/my-dojo

View File

@ -72,6 +72,10 @@ WHIRLPOOL_LATEST_VERSION_FILE=/home/bitcoin/.mynode/whirlpool_version_latest
DOJO_VERSION="v1.15.0" DOJO_VERSION="v1.15.0"
# Find at https://code.samourai.io/dojo/samourai-dojo/-/releases in fingerprints # Find at https://code.samourai.io/dojo/samourai-dojo/-/releases in fingerprints
DOJO_TAR_HASH="747b2e8ff4c747a221c2de75ffcf28c54ebaa198f258fc372513142189b02360" DOJO_TAR_HASH="747b2e8ff4c747a221c2de75ffcf28c54ebaa198f258fc372513142189b02360"
if [ "$IS_32_BIT" = "1" ]; then
DOJO_VERSION="v1.14.0"
DOJO_TAR_HASH="17aa26481e0a569719875687ed1744e3e45f3a7a70306298345d0a59acd17ad3"
fi
DOJO_VERSION_FILE=/mnt/hdd/mynode/settings/dojo_version DOJO_VERSION_FILE=/mnt/hdd/mynode/settings/dojo_version
DOJO_LATEST_VERSION_FILE=/mnt/hdd/mynode/settings/dojo_version_latest DOJO_LATEST_VERSION_FILE=/mnt/hdd/mynode/settings/dojo_version_latest

View File

@ -1,9 +1,18 @@
#!/bin/bash #!/bin/bash
source /usr/share/mynode/mynode_device_info.sh
source /usr/share/mynode/mynode_app_versions.sh
set -x set -x
set -e set -e
echo "==================== INSTALLING APP ====================" echo "==================== INSTALLING APP ===================="
# Update grpcio for last working arm32 version on Buster
if [ "$IS_RASPI4" = 1 ] && [ "$IS_32_BIT" = 1 ]; then
sed -i "s|grpcio|grpcio==$PYTHON_ARM32_GRPCIO_VERSION|g" requirements.txt
fi
# Install deps # Install deps
virtualenv -p python3 .venv virtualenv -p python3 .venv
.venv/bin/pip install -r requirements.txt .venv/bin/pip install -r requirements.txt