Merge branch 'master' into feature/add-ubuntu-iso-support

Author: pablomendezroyo

.github/workflows/artifacts.yml

@@ -73,7 +73,8 @@ jobs:
         run: |
           sed -i -e "/BASE_OS/s/ubuntu/debian/" docker-compose.yml
           sed -i -e "/UNATTENDED/s/true/false/" docker-compose.yml 
-          docker-compose up --build
+          docker compose build
+          docker compose up
 
       - name: Check Debian ISO attended
         run: |
@@ -90,7 +91,8 @@ jobs:
         run: |
           sed -i -e "/BASE_OS/s/ubuntu/debian/" docker-compose.yml
           sed -i -e "/UNATTENDED/s/false/true/" docker-compose.yml
-          docker-compose up --build
+          docker compose build
+          docker compose up
 
       - name: Check Debian ISO unattended
         run: |

.github/workflows/release.yml

@@ -70,7 +70,8 @@ jobs:
         run: |
           sed -i -e "/BASE_OS/s/ubuntu/debian/" docker-compose.yml
           sed -i -e "/UNATTENDED/s/true/false/" docker-compose.yml 
-          docker-compose up --build
+          docker compose build
+          docker compose up
 
       - name: Check Debian ISO attended
         run: |
@@ -85,7 +86,8 @@ jobs:
       - name: Build Debian unattended
         run: |
           sed -i -e "/UNATTENDED/s/false/true/" docker-compose.yml
-          docker-compose up --build
+          docker compose build
+          docker compose up
 
       - name: Check Debian ISO unattended
         run: |

.github/workflows/test.yml

@@ -40,7 +40,9 @@ jobs:
         uses: actions/checkout@v4
       - name: create iso
         run: |
-          docker-compose up --build
+          docker compose build
+          docker compose up
+          ls images/
       - name: verify image
         run: |
           ls -lrt images/Dappnode-*.iso

Dockerfile

@@ -2,7 +2,6 @@ FROM docker:dind
 # hadolint ignore=DL3018
 RUN apk update && \
     apk add --no-cache xorriso git xz curl ca-certificates iptables cpio bash perl-utils \
-    docker-compose && \
     rm -rf /var/cache/apk/* 
 
 #RUN apk add -U --repository http://dl-cdn.alpinelinux.org/alpine/edge/testing aufs-util

funding.json

@@ -0,0 +1,5 @@
+{
+  "opRetro": {
+    "projectId": "0xf839a585342327848d4541a6fcc315404e879537a60a1370f2cd45a94283a1ba"
+  }
+}

iso/scripts/generate_dappnode_iso_debian.sh

@@ -6,10 +6,10 @@ SCRIPTS_DIR=$(dirname "${BASH_SOURCE[0]}")
 source ${SCRIPTS_DIR}/common_iso_generation.sh
 
 # Source = https://cdimage.debian.org/debian-cd/current/amd64/iso-cd/debian-12.5.0-amd64-netinst.iso
-BASE_ISO_NAME="debian-12.5.0-amd64-netinst.iso"
+BASE_ISO_NAME="debian-12.7.0-amd64-netinst.iso"
 BASE_ISO_PATH="/images/${BASE_ISO_NAME}"
 BASE_ISO_URL="https://cdimage.debian.org/debian-cd/current/amd64/iso-cd/${BASE_ISO_NAME}"
-BASE_ISO_SHASUM="013f5b44670d81280b5b1bc02455842b250df2f0c6763398feb69af1a805a14f  ${BASE_ISO_PATH}"
+BASE_ISO_SHASUM="8fde79cfc6b20a696200fc5c15219cf6d721e8feb367e9e0e33a79d1cb68fa83  ${BASE_ISO_PATH}"
 
 DAPPNODE_ISO_NAME="${DAPPNODE_ISO_PREFIX}${BASE_ISO_NAME}"
 DAPPNODE_ISO_PATH="/images/${DAPPNODE_ISO_NAME}"

scripts/dappnode_install_pre.sh

@@ -168,13 +168,6 @@ else
     install_docker 2>&1 | tee -a $LOG_FILE
 fi
 
-# Only install docker-compose if needed
-if docker-compose -v >/dev/null 2>&1; then
-    echo -e "\e[32m \n\n docker-compose is already aliased \n\n \e[0m" 2>&1 | tee -a $LOG_FILE
-else
-    alias_docker_compose 2>&1 | tee -a $LOG_FILE
-fi
-
 # Only install wireguard-dkms if needed
 if modprobe wireguard >/dev/null 2>&1; then
     echo -e "\e[32m \n\n wireguard-dkms is already installed \n\n \e[0m" 2>&1 | tee -a $LOG_FILE