Merge branch 'master' into pablo/installer-instructions

Author: alexpeterson91

.dappnode_profile

@@ -1,12 +1,12 @@
 #!/bin/bash
 
 export BIND_VERSION="${BIND_VERSION:-0.2.6}"
-export IPFS_VERSION="${IPFS_VERSION:-0.2.15}"
+export IPFS_VERSION="${IPFS_VERSION:-0.2.18}"
 export VPN_VERSION="${VPN_VERSION:-0.2.8}"
-export DAPPMANAGER_VERSION="${DAPPMANAGER_VERSION:-0.2.46}"
+export DAPPMANAGER_VERSION="${DAPPMANAGER_VERSION:-0.2.58}"
 export WIFI_VERSION="${WIFI_VERSION:-0.2.8}"
-export WIREGUARD_VERSION="${WIREGUARD_VERSION:-0.1.1}"
-export HTTPS_VERSION="${HTTPS:-0.1.3}"
+export WIREGUARD_VERSION="${WIREGUARD_VERSION:-0.1.2}"
+export HTTPS_VERSION="${HTTPS:-0.1.4}"
 
 export DAPPNODE_DIR="/usr/src/dappnode"
 export DAPPNODE_CORE_DIR="${DAPPNODE_DIR}/DNCORE"

.github/CODEOWNERS

@@ -1,7 +1 @@
-# These owners will be the default owners for everything in the repo. Unless a later match takes precedence,
-# They will be requested for review when someone opens a pull request.
-*       @dapplion @eduadiez @pablomendezroyo @3alpha @Tropicar
-
-# Order is important; the last matching pattern takes the most precedence. When someone opens a pull request that only
-# modifies md files, only md owners and not the global owner(s) will be requested for a review.
-*.md    @Pol-Lanski @dapplion @eduadiez @pablomendezroyo @3alpha @Tropicar
+*       @dappnode/core

.github/workflows/release.yml

@@ -147,11 +147,18 @@ jobs:
 
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Check git diff
+        id: git_diff
+        run: |
+          git diff --no-index --word-diff-regex=[^[:space:]] --no-patch .dappnode_profile && echo '::set-output name=HAS_CHANGED::true' || echo '::set-output name=HAS_CHANGED::false'
+
       - name: Create Pull Request
+        if: steps.git_diff.outputs.HAS_CHANGED == 'true'
         uses: peter-evans/create-pull-request@v3
         with:
           add-paths: ".dappnode_profile"
-          commit-message: "update profile core packages versions"
+          commit-message: "update core packages versions"
           branch: "update-profile"
-          title: "update profile core packages versions"
+          title: "update core packages versions"
           delete-branch: true

README.md

@@ -4,7 +4,11 @@
 [![Documentation Wiki](https://img.shields.io/badge/Documentation-Wiki-brightgreen.svg)](https://docs.dappnode.io)
 [![GIVETH Campaign](https://img.shields.io/badge/GIVETH-Campaign-1e083c.svg)](https://beta.giveth.io/campaigns/5b44b198647f33526e67c262)
 ![GitHub All Releases](https://img.shields.io/github/downloads/dappnode/DAppNode/total.svg)
+[![GitPOAP Badge](https://public-api.gitpoap.io/v1/repo/dappnode/DAppNode/badge)](https://www.gitpoap.io/gh/dappnode/DAppNode)
 [![Twitter Follow](https://img.shields.io/twitter/follow/espadrine.svg?style=social&label=Follow)](https://twitter.com/DAppNODE?lang=es)
+[![Discord](https://img.shields.io/discord/747647430450741309?logo=discord&style=plastic)](https://discord.gg/dappnode)
+
+
 
 <br/>
 <p align="center">
@@ -24,14 +28,14 @@
 
 DAppNode is empowering people by creating a simple, transparent system for hosting P2P clients for DApps, Cryptocurrencies, VPNs, IPFS and more
 
-- Read about our purpose and mission [https://dappnode.io/](https://dappnode.io/)
-- Join our community [https://discord.gg/c28an8dA5k](https://discord.gg/c28an8dA5k)
-- Check out what we are delivering [https://medium.com/dappnode](https://medium.com/dappnode)
-- Share your ideas and support from us [https://discourse.dappnode.io/](https://discourse.dappnode.io/)
+- Read about our purpose and mission on [Our Website](https://dappnode.io/)
+- Join our community and find support on [Our Discord](https://discord.gg/dappnode)
+- Check out what we are up to on [Our Medium](https://medium.com/dappnode)
+- Share your ideas and find how to guides on [Our Forum](https://discourse.dappnode.io/)
 
 ## Discover DAppNode
 
-DAppNode lowers the barrier of entry for non tech-savy participants. It allows you to deploy, update, and manage P2P clients and nodes without leaving your browser. No terminal or command line interface.
+DAppNode lowers the barrier of entry for non tech-savvy participants. It allows you to deploy, update, and manage P2P clients and nodes without leaving your browser. No terminal or command line interface.
 
 <p align="center">
   <a href="https://install.dappnode.io">
@@ -41,7 +45,7 @@ DAppNode lowers the barrier of entry for non tech-savy participants. It allows y
 
 ## Develop with DAppNode
 
-DAppNode modular architecture allows any team to or project to publish a dockerized application to the DAppNode packages eco-system. Benefit from an enthusiatic crypto savy user based and offer a user interface-only experience to lower onboarding friction.
+DAppNode modular architecture allows any team to or project to publish a dockerized application to the DAppNode packages eco-system. Benefit from an enthusiastic crypto savvy user based and offer a user interface-only experience to lower onboarding friction.
 
 Check out the [DAppNodeSDK](https://github.com/dappnode/DAppNodeSDK) to learn how to get started.
 
@@ -59,7 +63,7 @@ The community and core team members have created many useful packages for users.
 
 ### Champions
 
-Champions are community members that are in charge of maintaining packages updated. All packages in this list without a champions are actively looking for a champion. Join our [DAppNode Discord **#champion-process**](https://discord.gg/MhSPBsHryu) to suggest a package to be championed and/or offer to be a champion for a project you care about!
+Champions are community members that are in charge of maintaining packages: keeping them updated and working. All packages in this list without a champion are actively looking for a champion. Join our [DAppNode Discord **#champion-process**](https://discord.gg/dappnode) to suggest a package to be championed and/or offer to be a champion for a project you care about!
 
 | Package                                                                                  | Champion         |
 | ---------------------------------------------------------------------------------------- | ---------------- |
@@ -115,11 +119,11 @@ Champions are community members that are in charge of maintaining packages updat
 
 Get your DAppNode and start contributing to decentralization by running your own nodes.
 
-[Install DAppNode on your host machine](https://docs.dappnode.io/install/) or buy your DAppNode with all the stuff configured and prepared to be used in [DAppNode shop](https://shop.dappnode.io/)
+[Install DAppNode on your host machine](https://docs.dappnode.io/get-started/installation/custom-hardware/installation/overview) or buy your DAppNode with all the stuff configured and prepared to be used in [DAppNode shop](https://shop.dappnode.io/)
 
 ### Install DAppNode with ISO
 
-DAppNode ISO available in: [latest DAppNode release](https://github.com/dappnode/DAppNode/releases)
+DAppNode ISO available is in: [latest DAppNode release](https://github.com/dappnode/DAppNode/releases).
 
 Install DAppNode on your host machine by burning DAppNode ISO to a DVD or creating a bootable USB. Follow the tutorial of your operating system below and come back when you are finished:
 
@@ -146,13 +150,13 @@ _Note_: ISO could be generated as unattended/attended by editing the env var ava
 
 ### Install DAppNode with scripts
 
-Scripts available in: [latest DAppNode release](https://github.com/dappnode/DAppNode/releases)
+Scripts are available in: [latest DAppNode release](https://github.com/dappnode/DAppNode/releases).
 
-DAppNode could be also installed on a host machine with an OS already running on it. DAppNode has been developed and configured to be run on debian host machines so is preferably to install DAppNode on Debian or debian based (like Ubuntu) host machines.
+DAppNode could be also installed on a host machine with an OS already running on it. DAppNode has been developed and configured to be run on Debian host machines. Therefore, it should work on Debian or Debian based (like Ubuntu) host machines. Minimum recommended Debian version is 11.
 
-**1. Prerrequisites**
+**1. Prerequisites**
 
-Before install DAppNode with the script option, make sure you fullfill the requirements by running the following script:
+Before installing DAppNode with the script option, make sure you fulfill the requirements by running the following script:
 
 ```bash
 sudo wget -O - https://prerequisites.dappnode.io | sudo bash
@@ -168,7 +172,7 @@ sudo wget -O - https://installer.dappnode.io | sudo bash
 
 **3. Uninstall DAppNode**
 
-Uinstall DAppNode on your host machine by running the following command:
+Uninstall DAppNode from your host machine by running the following command:
 
 ```bash
 wget -qO - https://uninstaller.dappnode.io | sudo bash
@@ -184,7 +188,7 @@ sudo wget -O - https://installer.dappnode.io | sudo UPDATE=true bash
 
 ## Releases
 
-Create releases manually with github actions, the github action to run is: **Pre-release**. Requirements are:
+Create releases manually with Github actions, the Github action to run is: **Pre-release**. The requirements are:
 
 - Introduce the core packages versions
 - There must exist the corresponding core package release for the specified version
@@ -202,15 +206,15 @@ The release will contain:
 
 ## Testing with artifacts
 
-Generate ISOs and test them by running the github action: **Artifacts**. This action will generate an artifacts with the same assets as the release, useful for testing purposes.
+Generate ISOs and test them by running the Github action: **Artifacts**. This action will generate an artifacts with the same assets as the release, useful for testing purposes.
 
 ## Versioning
 
 We use [SemVer](http://semver.org/) for versioning. For the versions available, see the [tags on this repository](https://github.com/dappnode/DAppNode/tags).
 
 ## Team members
 
-Members of the [White Hat Group (WHG)](https://motherboard.vice.com/en_us/article/qvp5b3/how-ethereum-coders-hacked-back-to-rescue-dollar208-million-in-ethereum) have spent countless hours boostraping and developing DAppNode in 2017. Currently, the project is mantained by a growing multi-disciplary team:
+Members of the [White Hat Group (WHG)](https://motherboard.vice.com/en_us/article/qvp5b3/how-ethereum-coders-hacked-back-to-rescue-dollar208-million-in-ethereum) have spent countless hours bootstrapping and developing DAppNode in 2017. Currently, the project is maintained by a growing multi-disciplinary team:
 
 - **Adviser & Instigator:** Jordi Baylina
 - **Project Lead:** Eduadiez
@@ -223,3 +227,7 @@ Members of the [White Hat Group (WHG)](https://motherboard.vice.com/en_us/articl
 ## License
 
 This project is licensed under the GNU General Public License v3.0 - see the [LICENSE](LICENSE) file for details
+
+## Copyright
+
+Copyright © (2018-2022) [The DAppNode Association](https://dappnode.io)

doc/DE686960-C68E-43A5-96E9-A6B4B8B0C244.png

@@ -35,10 +35,8 @@ d-i preseed/late_command string \
     in-target mkdir -p /usr/src/dappnode; \
     cp -ar /cdrom/dappnode/* /target/usr/src/dappnode/; \
     cp -a /cdrom/dappnode/scripts/rc.local /target/etc/rc.local; \
-    cp -a /cdrom/dappnode/bin/docker/docker-compose-Linux-x86_64 /target/usr/local/bin/docker-compose; \
     in-target chmod +x /usr/src/dappnode/scripts/dappnode_install_pre.sh; \
     in-target chmod +x /usr/src/dappnode/scripts/static_ip.sh; \
-    in-target chmod +x /usr/local/bin/docker-compose; \
     in-target gpasswd -a $(getent passwd "1000" | cut -d: -f1) sudo; \
     /target/usr/src/dappnode/scripts/static_ip.sh; \
     in-target /usr/src/dappnode/scripts/dappnode_install_pre.sh UPDATE

iso/preseeds/preseed.cfg

@@ -17,13 +17,13 @@ d-i netcfg/get_domain string dappnode.eth
 d-i netcfg/get_domain seen true
 
 ### Account setup
-d-i passwd/root-login boolean false # dappnode user will not be in sudo
+d-i passwd/root-login boolean false
 d-i passwd/user-fullname string DAppNode
 d-i passwd/username string dappnode
 # Use `mkpasswd -m sha-512` to  generate the hash
 # Using "dappnode.s0" as default
 d-i passwd/user-password-crypted password $6$insecur3$rnEv9Amdjn3ctXxPYOlzj/cwvLT43GjWzkPECIHNqd8Vvza5bMG8QqMwEIBKYqnj609D.4ngi4qlmt29dLE.71
-d-i passwd/root-password-crypted password $6$insecur3$rnEv9Amdjn3ctXxPYOlzj/cwvLT43GjWzkPECIHNqd8Vvza5bMG8QqMwEIBKYqnj609D.4ngi4qlmt29dLE.71
+# d-i passwd/root-password-crypted password $6$insecur3$rnEv9Amdjn3ctXxPYOlzj/cwvLT43GjWzkPECIHNqd8Vvza5bMG8QqMwEIBKYqnj609D.4ngi4qlmt29dLE.71
 
 ### Clock and time zone setup
 d-i clock-setup/utc boolean false
@@ -75,9 +75,7 @@ d-i preseed/late_command string \
     cp -a /etc/network/interfaces /target/etc/network/interfaces; \
     cp -ar /cdrom/dappnode/* /target/usr/src/dappnode/; \
     cp -a /cdrom/dappnode/scripts/rc.local /target/etc/rc.local; \
-    cp -a /cdrom/dappnode/bin/docker/docker-compose-Linux-x86_64 /target/usr/local/bin/docker-compose; \
     in-target chmod +x /usr/src/dappnode/scripts/dappnode_install_pre.sh; \
-    in-target chmod +x /usr/local/bin/docker-compose; \
     in-target touch /usr/src/dappnode/.firstboot; \
     in-target /usr/src/dappnode/scripts/dappnode_install_pre.sh UPDATE
 d-i finish-install/reboot_in_progress note

iso/preseeds/preseed_unattended.cfg

@@ -8,7 +8,7 @@ source /tmp/vars.sh
 
 DAPPNODE_CORE_DIR="/images"
 DAPPNODE_HASH_FILE="${DAPPNODE_CORE_DIR}/packages-content-hash.csv"
-CONTENT_HASH_PKGS=(geth openethereum nethermind)
+CONTENT_HASH_PKGS=(geth nethermind erigon prysm teku lighthouse nimbus)
 IPFS_ENDPOINT=${IPFS_ENDPOINT:-"http://ipfs.io"}
 
 SWGET="wget -q -O-"
@@ -24,7 +24,7 @@ for comp in "${components[@]}"; do
     if [[ ${!ver} == /ipfs/* ]]; then
         DOWNLOAD_URL="${IPFS_ENDPOINT}/api/v0/cat?arg=${!ver%:*}"
     fi
-    
+
     eval "${comp}_URL=\"${DOWNLOAD_URL}/${comp,,}.dnp.dappnode.eth_${!ver##*:}_linux-amd64.txz\""
     eval "${comp}_YML=\"${DOWNLOAD_URL}/docker-compose.yml\""
     eval "${comp}_MANIFEST=\"${DOWNLOAD_URL}/dappnode_package.json\""

iso/scripts/download_core.sh

@@ -5,6 +5,7 @@ dockerd &
 sleep 5
 
 if [ "$CLEAN" = true ]; then
+    rm -f /images/DAppNode*.iso
     rm -f /images/*.tar.xz
     rm -f /images/*.yml
     rm -f /images/*.json

iso/scripts/generate_ISO.sh

@@ -2,10 +2,10 @@
 set -e
 
 # Source = https://cdimage.debian.org/cdimage/unofficial/non-free/cd-including-firmware/current/amd64/iso-cd/
-ISO_NAME=firmware-11.1.0-amd64-netinst.iso
+ISO_NAME=firmware-11.5.0-amd64-netinst.iso
 ISO_PATH="/images/${ISO_NAME}"
-ISO_URL=http://cdimage.debian.org/cdimage/unofficial/non-free/cd-including-firmware/archive/11.1.0+nonfree/amd64/iso-cd/
-SHASUM="baab78aa4dac175511915a20b095da69131ef5c84b73e637a6933c03b561cdfd  ${ISO_PATH}"
+ISO_URL=https://cdimage.debian.org/cdimage/unofficial/non-free/cd-including-firmware/11.5.0+nonfree/amd64/iso-cd/
+SHASUM="ce1dcd1fa272976ddc387554202013e69ecf1b02b38fba4f8c35c8b12b8f521e  ${ISO_PATH}"
 
 echo "Downloading debian ISO image: ${ISO_NAME}..."
 if [ ! -f ${ISO_PATH} ]; then
@@ -15,7 +15,10 @@ fi
 echo "Done!"
 
 echo "Verifying download..."
-[[ "$(shasum -a 256 ${ISO_PATH})" != "$SHASUM" ]] && { echo "ERROR: wrong shasum"; exit 1; }
+[[ "$(shasum -a 256 ${ISO_PATH})" != "$SHASUM" ]] && {
+    echo "ERROR: wrong shasum"
+    exit 1
+}
 
 echo "Clean old files..."
 rm -rf dappnode-isoº
@@ -35,26 +38,18 @@ echo "Downloading third-party packages..."
 sed '1,/^\#\!ISOBUILD/!d' /usr/src/app/scripts/dappnode_install_pre.sh >/tmp/vars.sh
 # shellcheck disable=SC1091
 source /tmp/vars.sh
-mkdir -p /images/bin/docker
-cd /images/bin/docker
-[ -f "${DOCKER_PKG}" ] || wget "${DOCKER_URL}"
-[ -f "${DOCKER_CLI_PKG}" ] || wget "${DOCKER_CLI_URL}"
-[ -f "${CONTAINERD_PKG}" ] || wget "${CONTAINERD_URL}"
-[ -f docker-compose-Linux-x86_64 ] || wget "${DCMP_URL}"
-cd - # /usr/src/app/dappnode-iso
 
 echo "Creating necessary directories and copying files..."
-mkdir -p /usr/src/app/dappnode-iso/dappnode 
+mkdir -p /usr/src/app/dappnode-iso/dappnode
 cp -r /usr/src/app/scripts /usr/src/app/dappnode-iso/dappnode
 cp -r /usr/src/app/dappnode/* /usr/src/app/dappnode-iso/dappnode
-cp -vr /images/bin /usr/src/app/dappnode-iso/dappnode/
 
 echo "Customizing preseed..."
 mkdir -p /tmp/makeinitrd
 cd install.amd
 cp initrd.gz /tmp/makeinitrd/
-if [[ ${UNATTENDED} == "true" ]]; then
-   cp /usr/src/app/iso/preseeds/preseed_unattended.cfg /tmp/makeinitrd/preseed.cfg
+if [[ $UNATTENDED == *"true"* ]]; then
+    cp /usr/src/app/iso/preseeds/preseed_unattended.cfg /tmp/makeinitrd/preseed.cfg
 else
     cp /usr/src/app/iso/preseeds/preseed.cfg /tmp/makeinitrd/preseed.cfg
 fi