Update packer.sh

try fatpack

CHANGES.md

@@ -1,3 +1,10 @@
+## What's new in Version 1.11.2 of RaspiBlitz?
+
+This is just a quick patch release for v1.11.1
+
+- Fix: Core Lightning fresh wallet setup #4170
+- Fix: Update Tor repo siging keys
+
 ## What's new in Version 1.11.1 of RaspiBlitz?
 
 - New: Set Timezone SSHMENU > SYSTEM > TIME [details](https://github.com/raspiblitz/raspiblitz/issues/1712)

ci/arm64-rpi/build.arm64-rpi.pkr.hcl

@@ -3,7 +3,7 @@ variable "github_user" { default = "raspiblitz" }
 variable "branch" { default = "dev" }
 variable "image_link" { default = "https://downloads.raspberrypi.org/raspios_arm64/images/raspios_arm64-2024-03-15/2024-03-15-raspios-bookworm-arm64.img.xz" }
 variable "image_checksum" { default = "7e53a46aab92051d523d7283c080532bebb52ce86758629bf1951be9b4b0560f" }
-variable "image_size" { default = "20G" }
+variable "image_size" { default = "24G" }
 
 source "arm" "raspiblitz-arm64-rpi" {
   file_checksum_type    = "sha256"

ci/arm64-rpi/packer.build.arm64-rpi.local.sh

@@ -29,7 +29,7 @@ echo -e "\n# Install Packer..."
 if ! packer version 2>/dev/null; then
   curl -fsSL https://apt.releases.hashicorp.com/gpg | sudo apt-key add -
   sudo apt-add-repository -y "deb [arch=amd64] https://apt.releases.hashicorp.com $(lsb_release -cs) main"
-  sudo apt-get update -y && sudo apt-get install packer -y || exit 1
+  sudo apt-get update -y && sudo apt-get install packer=1.10.0-1 -y || exit 1
 else
   echo "# Packer is installed"
 fi
@@ -52,7 +52,7 @@ echo -e "\n# Download the packer-builder-arm plugin"
 git clone https://github.com/mkaczanowski/packer-builder-arm
 cd packer-builder-arm
 # https://github.com/mkaczanowski/packer-builder-arm/releases
-git reset --hard "v1.0.7"
+git reset --hard "v1.0.9"
 echo -e "\n# Build the packer-builder-arm plugin"
 go mod download
 go build || exit 1

ci/packer.sh

@@ -146,7 +146,7 @@ if [ "${ARCH}" == "arm" ] && [ "${TYPE}" == "min" ]; then
   PACKERFINALFILE="raspiblitz-min-v${codeVersion}-${dateString}.img"
 elif [ "${ARCH}" == "arm" ] && [ "${TYPE}" == "fat" ]; then
   PACKERTARGET="arm64-rpi-fatpack-image" 
-  PACKERBUILDPATH="./raspiblitz/ci/arm64-rpi/packer-builder-arm/TODO" #TODO
+  PACKERBUILDPATH="./raspiblitz/ci/arm64-rpi/packer-builder-arm/raspiblitz-arm64-rpi-fat.img"
   PACKERFINALFILE="raspiblitz-fat-v${codeVersion}-${dateString}.img"
 elif [ "${ARCH}" == "x86" ] && [ "${TYPE}" == "min" ]; then
   PACKERTARGET="amd64-lean-server-legacyboot-image"

home.admin/99connectMenu.sh

@@ -79,7 +79,7 @@ case $CHOICE in
     sudo /home/admin/config.scripts/lnd.export.sh
     exit 0;;
   RESET-TLS)
-    sudo /home/admin/config.scripts/internetselfsignedcert.sh reset
+    sudo /home/admin/config.scripts/internet.selfsignedcert.sh reset
     exit 0;;
   ALBY)
     /home/admin/config.scripts/bonus.alby.sh

home.admin/_version.info

@@ -1,3 +1,3 @@
 # RaspiBlitz Version - always [major].[main].[sub] (sub can be a string like '2rc1')
-codeVersion="1.11.1"
+codeVersion="1.11.2"
 # keep last line with comment ---> IF YOU HAVE A NEW VERSION BRANCH > EDIT ALSO build_sdcard.sh

home.admin/config.scripts/blitz.docker.sh

@@ -1,152 +0,0 @@
-#!/bin/bash
-
-# NOTE: Like the nodeJS frame work docker can be used to run additional apps
-# the goal is that you can run a basic RaspiBlitz install without Docker
-# but if you want to run certain special apps they can switch Docker on
-
-# command info
-if [ $# -eq 0 ] || [ "$1" = "-h" ] || [ "$1" = "-help" ]; then
-  echo "config script to install Docker"
-  echo "blitz.docker.sh [on|off]"
-  exit 1
-fi
-
-source /mnt/hdd/raspiblitz.conf
-
-# switch on
-if [ "$1" = "1" ] || [ "$1" = "on" ]; then
-
-  echo
-  echo "### 1) INSTALL Docker ###"
-
-  # check if Docker is installed
-  if docker -v 2>/dev/null ; then
-    echo "# Docker is already installed"
-    docker -v
-    docker compose version
-    exit 0
-  fi
-
-  ## run easy install script provided by Docker
-  ## its a copy from https://get.docker.com
-  #sudo chmod +x /home/admin/assets/get-docker.sh
-  #sudo /home/admin/assets/get-docker.sh
-
-  # https://github.com/rootzoll/raspiblitz/issues/2074#issuecomment-819435910
-  # dependencies
-  sudo apt-get update
-  sudo apt-get install -y \
-   apt-transport-https \
-   ca-certificates \
-   curl \
-   gnupg \
-   lsb-release
-
-  # add the docker repo
-  if ! gpg /usr/share/keyrings/docker-archive-keyring.gpg 2>/dev/null; then
-    curl -fsSL https://download.docker.com/linux/debian/gpg | sudo gpg --dearmor -o /usr/share/keyrings/docker-archive-keyring.gpg
-  fi
-  echo \
-   "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/docker-archive-keyring.gpg] https://download.docker.com/linux/debian \
-   $(lsb_release -cs) stable" | sudo tee /etc/apt/sources.list.d/docker.list > /dev/null
-
-  sudo apt-get update
-
-  # install docker
-  sudo apt-get install -y docker-ce docker-ce-cli containerd.io
-
-  # add the default user to the docker group
-  # https://docs.docker.com/engine/install/linux-postinstall/#manage-docker-as-a-non-root-user
-  sudo usermod -aG docker admin
-
-  echo
-  echo "### 2) INSTALL docker compose ###"
-
-  # add docker compose
-  # sudo pip3 install docker-compose
-  # add bash completion  https://docs.docker.com/compose/completion/
-  # sudo curl \
-  #  -L https://raw.githubusercontent.com/docker/compose/1.29.0/contrib/completion/bash/docker-compose \
-  #  -o /etc/bash_completion.d/docker-compose
-
-  # https://docs.docker.com/compose/cli-command/#install-on-linux
-  DockerComposeVersion=2.14.2
-  # DOCKER_CONFIG=${DOCKER_CONFIG:-$HOME/.docker}
-  # mkdir -p $DOCKER_CONFIG/cli-plugins
-  sudo mkdir -p /usr/local/lib/docker/cli-plugins
-  sudo curl -SL "https://github.com/docker/compose/releases/download/v${DockerComposeVersion}/docker-compose-linux-$(uname -m)" \
-   -o /usr/local/lib/docker/cli-plugins/docker-compose
-  sudo chmod +x /usr/local/lib/docker/cli-plugins/docker-compose
-
-  # switch docker-compose to docker compose
-  # curl -fL https://raw.githubusercontent.com/docker/compose-switch/master/install_on_linux.sh | sudo sh
-  COMPOSE_SWITCH_VERSION="v1.0.5"
-  COMPOSE_SWITCH_URL="https://github.com/docker/compose-switch/releases/download/${COMPOSE_SWITCH_VERSION}/docker-compose-linux-$(dpkg --print-architecture)"
-  if ! docker compose version 2>&1 >/dev/null; then
-    echo "Docker Compose V2 is not installed"
-    exit 1
-  fi
-  sudo curl -fL $COMPOSE_SWITCH_URL -o /usr/local/bin/compose-switch
-  sudo chmod +x /usr/local/bin/compose-switch
-  COMPOSE=$(command -v docker-compose)
-  if [ "$COMPOSE" = /usr/local/bin/docker-compose ]; then
-    # This is a manual installation of docker-compose
-    # so, safe for us to rename binary
-    sudo mv /usr/local/bin/docker-compose /usr/local/bin/docker-compose-v1
-    COMPOSE=/usr/local/bin/docker-compose-v1
-  fi
-  ALTERNATIVES="update-alternatives"
-  if ! command -v $ALTERNATIVES; then
-    ALTERNATIVES=alternatives
-  fi
-  echo "Configuring docker-compose alternatives"
-  if [ -n "$COMPOSE" ]; then
-    sudo $ALTERNATIVES --install /usr/local/bin/docker-compose docker-compose $COMPOSE 1
-  fi
-  sudo $ALTERNATIVES --install /usr/local/bin/docker-compose docker-compose /usr/local/bin/compose-switch 99
-  echo "'docker-compose' is now set to run Compose V2"
-  echo "use '$ALTERNATIVES --config docker-compose' if you want to switch back to Compose V1"
-
-  echo
-  echo "### 3) Symlink the working directory to the SSD"
-  sudo systemctl stop docker
-  sudo systemctl stop docker.socket
-
-  # keep the docker dir on the OS drive if the disk is ZFS - needs special config
-   isZFS=$(zfs list 2>/dev/null | grep -c "/mnt/hdd")
-  if [ "${isZFS}" -eq 0 ]; then
-    sudo mv -f /var/lib/docker /mnt/hdd/
-    sudo ln -s /mnt/hdd/docker /var/lib/docker
-  # move to a different partition or configure docker with ZFS
-  # https://docs.docker.com/storage/storagedriver/zfs-driver/#configure-docker-with-the-zfs-storage-driver
-  #else
-  #  sudo mv -f /var/lib/docker /home/admin/
-  #  sudo ln -s /home/admin/docker /var/lib/docker
-  fi
-  sudo systemctl start docker
-  sudo systemctl start docker.socket
-
-  # setting value in raspi blitz config
-  /home/admin/config.scripts/blitz.conf.sh set docker "on"
-  echo "# Docker install done"
-  docker -v
-  docker compose version
-  exit 0
-fi
-
-# switch off
-if [ "$1" = "0" ] || [ "$1" = "off" ]; then
-  # setting value in raspiblitz config
-  /home/admin/config.scripts/blitz.conf.sh set docker "off"
-  echo "*** REMOVING Docker & docker-compose ***"
-  sudo pip3 uninstall -y docker-compose
-  sudo rm /usr/local/lib/docker/cli-plugins/docker-compose
-  sudo rm /usr/local/bin/docker-compose-v1
-  sudo rm /usr/local/bin/compose-switch
-  sudo apt-get purge -y docker-ce docker-ce-cli containerd.io
-  echo "# Docker remove done"
-  exit 0
-fi
-
-echo "error='wrong parameter'"
-exit 1

home.admin/config.scripts/blitz.preparerelease.sh

@@ -65,6 +65,9 @@ echo "reset DNS confs ..."
 echo -e "nameserver 1.1.1.1\nnameserver 84.200.69.80" | sudo tee /etc/resolv.conf > /dev/null
 echo "OK"
 
+# make sure Tor respo signing keys are uptodate #4648
+wget -qO- https://deb.torproject.org/torproject.org/A3C4F0F979CAA22CDBA8F512EE8CBC9E886DDD89.asc | gpg --dearmor | sudo tee /etc/apt/trusted.gpg.d/torproject.gpg >/dev/null
+
 # update system (only security updates with minimal risk of breaking changes)
 echo
 echo "update OS ..."

home.admin/config.scripts/bonus.charge-lnd.sh

@@ -74,7 +74,7 @@ Description=charge-lnd
 After=lnd.service
 
 [Service]
-ExecStart=/home/bitcoin/charge-lnd/bin/charge-lnd -c /mnt/hdd/app-data/charge-lnd/charge.config
+ExecStart=bash -c '. /home/bitcoin/charge-lnd/bin/activate; /home/bitcoin/charge-lnd/bin/charge-lnd -c /mnt/hdd/app-data/charge-lnd/charge.config'
 User=bitcoin
 Group=bitcoin
 Type=simple

home.admin/config.scripts/bonus.lnbits.sh

@@ -589,6 +589,7 @@ if [ "$1" = "sync" ] || [ "$1" = "repo" ]; then
   echo "# check if poetry in installed, if not install it"
   if ! sudo -u lnbits which poetry; then
     echo "# install poetry"
+    sudo pip3 config set global.break-system-packages true
     sudo pip3 install --upgrade pip
     sudo pip3 install poetry
   fi
@@ -650,6 +651,7 @@ if [ "$1" = "install" ]; then
   # check if poetry in installed, if not install it
   if ! sudo -u lnbits which poetry; then
     echo "# install poetry"
+    sudo pip3 config set global.break-system-packages true
     sudo pip3 install --upgrade pip
     sudo pip3 install poetry
   fi

home.admin/config.scripts/bonus.suez.sh

@@ -35,6 +35,7 @@ if [ "$1" = "1" ] || [ "$1" = "on" ]; then
   cd /home/bitcoin || exit 1
 
   # poetry
+  sudo pip3 config set global.break-system-packages true
   sudo pip3 install --upgrade pip
   sudo pip3 install poetry
 
@@ -80,6 +81,7 @@ if [ "$1" = "update" ]; then
   echo "# UPDATE SUEZ"
   cd /home/bitcoin || exit 1
   # dependency
+  sudo pip3 config set global.break-system-packages true
   sudo pip3 install --upgrade pip
   sudo pip3 install poetry
   # download source code

home.admin/config.scripts/cl-plugin.backup.sh

@@ -40,9 +40,11 @@ function install() {
   if [ $($lightningcli_alias plugin list 2>/dev/null | grep -c "/${plugin}") -eq 0 ]; then
     echo "# Checking dependencies"
     # upgrade pip
+    sudo pip3 config set global.break-system-packages true
     sudo pip3 install --upgrade pip
 
     # pip dependencies
+    sudo -u bitcoin pip3 config set global.break-system-packages true
     sudo -u bitcoin pip3 install pyln-client tqdm psutil
 
     # poetry

home.admin/config.scripts/cl-plugin.feeadjuster.sh

@@ -18,6 +18,7 @@ if [ "$1" = "on" ];then
   if [ ! -f "/home/bitcoin/cl-plugins-available/plugins/${plugin}/${plugin}.py" ]; then
     cd /home/bitcoin/cl-plugins-available || exit 1
     sudo -u bitcoin git clone https://github.com/lightningd/plugins.git
+    sudo -u bitcoin pip config set global.break-system-packages true
     sudo -u bitcoin pip install -r /home/bitcoin/cl-plugins-available/plugins/${plugin}/requirements.txt
   fi
   if [ ! -L /home/bitcoin/${netprefix}cl-plugins-enabled/${plugin}.py ];then

home.admin/config.scripts/cl-plugin.standard-python.sh

@@ -45,6 +45,7 @@ if [ "$1" = "on" ]; then
   else
     if [ $($lightningcli_alias | grep -c "/${plugin}") -eq 0 ]; then
       echo "# Just start the ${plugin} plugin"
+      sudo -u bitcoin pip config set global.break-system-packages true
       sudo -u bitcoin pip install -r /home/bitcoin/cl-plugins-available/plugins/${plugin}/requirements.txt
       $lightningcli_alias plugin start /home/bitcoin/cl-plugins-available/plugins/${plugin}/${plugin}.py
     fi

home.admin/config.scripts/cl.hsmtool.sh

@@ -217,6 +217,7 @@ if [ "$1" = "new" ] || [ "$1" = "new-force" ] || [ "$1" = "seed" ] || [ "$1" = "
 
   # check for https://github.com/trezor/python-mnemonic
   if [ $(pip list | grep -c mnemonic) -eq 0 ];then
+    pip config set global.break-system-packages true
     pip install mnemonic==0.19 1>/dev/null
   fi
 

home.admin/config.scripts/cl.install.sh

@@ -46,10 +46,12 @@ function installDependencies() {
   # for clnrest (since v23.11)
   sudo apt-get install -y python3-json5 python3-flask python3-gunicorn
   # upgrade pip
+  sudo pip3 config set global.break-system-packages true
   sudo pip3 install --upgrade pip
   # for clnrest
-  pip3 install mako
+  sudo pip3 install mako
   cd /home/bitcoin/lightning || exit 1
+  sudo -u bitcoin pip3 config set global.break-system-packages true
   sudo -u bitcoin pip3 install --user -r plugins/clnrest/requirements.txt
   # poetry
   sudo pip3 install poetry

home.admin/config.scripts/lnd.install.sh

@@ -490,6 +490,7 @@ alias ${netprefix}lndconf=\"sudo nano /home/bitcoin/.lnd/${netprefix}lnd.conf\"\
   fi
 
   # needed to make lnd.newwallet.py work
+  pip config set global.break-system-packages true
   pip install --upgrade google-api-python-client
 
   exit 0