From e36d5d926471dc77a37c81d94e19d379a169b715 Mon Sep 17 00:00:00 2001 From: pablomendezroyo Date: Thu, 4 Sep 2025 09:45:55 +0200 Subject: [PATCH 1/4] Add ubuntu ISO to CI --- .github/workflows/release.yml | 60 +++++++++++++++++++++-------------- 1 file changed, 36 insertions(+), 24 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 7a6364a..904c099 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -103,23 +103,23 @@ jobs: unattended_filename="${core_filename/%.iso/-unattended.iso}" # Replace .iso with -unattended.iso sudo cp "$file" "images/$unattended_filename" - # - name: Build Ubuntu unattended - # run: | - # export BASE_OS=ubuntu - # export UNATTENDED=true - # docker compose up --build - - # - name: Check Ubuntu ISO unattended - # run: | - # ls -lrt images/Dappnode-ubuntu-*.iso - - # - name: Set Ubuntu Dappnode unattended ISO name - # run: | - # file=$(ls images/Dappnode-ubuntu-*.iso) - # filename=$(basename "$file") # Extract only the file name (without path) - # core_filename="Dappnode-${CORE_VERSION}-ubuntu-${filename#Dappnode-ubuntu-}" # Modify the filename using CORE_VERSION - # unattended_filename="${core_filename/%.iso/-unattended.iso}" # Replace .iso with -unattended.iso - # sudo cp "$file" "images/$unattended_filename" + - name: Build Ubuntu unattended + run: | + export BASE_OS=ubuntu + export UNATTENDED=true + docker compose up --build + + - name: Check Ubuntu ISO unattended + run: | + ls -lrt images/Dappnode-ubuntu-*.iso + + - name: Set Ubuntu Dappnode unattended ISO name + run: | + file=$(ls images/Dappnode-ubuntu-*.iso) + filename=$(basename "$file") # Extract only the file name (without path) + core_filename="Dappnode-${CORE_VERSION}-ubuntu-${filename#Dappnode-ubuntu-}" # Modify the filename using CORE_VERSION + unattended_filename="${core_filename/%.iso/-unattended.iso}" # Replace .iso with -unattended.iso + sudo cp "$file" "images/$unattended_filename" - name: Create dappnode_profile.sh run: | @@ -140,12 +140,12 @@ jobs: SHASUM_DEBIAN_UNATTENDED=$(shasum -a 256 $file) echo "::set-output name=SHASUM_DEBIAN_UNATTENDED::$SHASUM_DEBIAN_UNATTENDED" - # - name: Get SHA-256 Ubuntu unattended - # id: shasum-ubuntu-unattended - # run: | - # file=$(find . -type f -name 'Dappnode-ubuntu-*unattended.iso') - # SHASUM_UBUNTU_UNATTENDED=$(shasum -a 256 $file) - # echo "::set-output name=SHASUM_UBUNTU_UNATTENDED::$SHASUM_UBUNTU_UNATTENDED" + - name: Get SHA-256 Ubuntu unattended + id: shasum-ubuntu-unattended + run: | + file=$(find . -type f -name 'Dappnode-ubuntu-*unattended.iso') + SHASUM_UBUNTU_UNATTENDED=$(shasum -a 256 $file) + echo "::set-output name=SHASUM_UBUNTU_UNATTENDED::$SHASUM_UBUNTU_UNATTENDED" - name: Write release content run: | @@ -154,7 +154,6 @@ jobs: env: SHASUM_DEBIAN_ATTENDED: ${{ steps.shasum-debian-attended.outputs.SHASUM_DEBIAN_ATTENDED }} SHASUM_DEBIAN_UNATTENDED: ${{ steps.shasum-debian-unattended.outputs.SHASUM_DEBIAN_UNATTENDED }} - # SHASUM_UBUNTU_UNATTENDED: ${{ steps.shasum-ubuntu-unattended.outputs.SHASUM_UBUNTU_UNATTENDED }} # print images directory - name: Print images directory @@ -176,3 +175,16 @@ jobs: body_path: CHANGELOG.md env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + + - name: Upload Ubuntu unattended to SSH server (and shasum) + uses: appleboy/scp-action@v0.1.7 + with: + host: ${{ secrets.ISO_SSH_HOST }} + username: ${{ secrets.ISO_SSH_USER }} + key: ${{ secrets.ISO_SSH_PRIVATE_KEY }} + port: ${{ secrets.SSH_PORT }} + source: "SHASUM_UBUNTU_UNATTENDED|./images/Dappnode-*-ubuntu-*-unattended.iso" + target: ${{ secrets.ISO_SSH_PATH }} + overwrite: true + env: + SHASUM_UBUNTU_UNATTENDED: ${{ steps.shasum-ubuntu-unattended.outputs.SHASUM_UBUNTU_UNATTENDED }} \ No newline at end of file From 9dac9fc1020bd3ee28dba4199c4c9a247ef93ba0 Mon Sep 17 00:00:00 2001 From: pablomendezroyo Date: Thu, 4 Sep 2025 10:27:33 +0200 Subject: [PATCH 2/4] fix file path usage --- .github/workflows/release.yml | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 904c099..d6a3b89 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -143,9 +143,10 @@ jobs: - name: Get SHA-256 Ubuntu unattended id: shasum-ubuntu-unattended run: | - file=$(find . -type f -name 'Dappnode-ubuntu-*unattended.iso') - SHASUM_UBUNTU_UNATTENDED=$(shasum -a 256 $file) - echo "::set-output name=SHASUM_UBUNTU_UNATTENDED::$SHASUM_UBUNTU_UNATTENDED" + file=$(find . -type f -name 'Dappnode-ubuntu-*unattended.iso') + SHASUM_UBUNTU_UNATTENDED=$(shasum -a 256 $file) + echo "$SHASUM_UBUNTU_UNATTENDED" > SHASUM_UBUNTU_UNATTENDED.txt + echo "::set-output name=SHASUM_UBUNTU_UNATTENDED::$SHASUM_UBUNTU_UNATTENDED" - name: Write release content run: | @@ -183,8 +184,6 @@ jobs: username: ${{ secrets.ISO_SSH_USER }} key: ${{ secrets.ISO_SSH_PRIVATE_KEY }} port: ${{ secrets.SSH_PORT }} - source: "SHASUM_UBUNTU_UNATTENDED|./images/Dappnode-*-ubuntu-*-unattended.iso" + source: SHASUM_UBUNTU_UNATTENDED.txt,./images/Dappnode-*-ubuntu-*-unattended.iso target: ${{ secrets.ISO_SSH_PATH }} overwrite: true - env: - SHASUM_UBUNTU_UNATTENDED: ${{ steps.shasum-ubuntu-unattended.outputs.SHASUM_UBUNTU_UNATTENDED }} \ No newline at end of file From 2bb618fa5b61a930e85a7a89c6836893506b68f7 Mon Sep 17 00:00:00 2001 From: pablomendezroyo Date: Thu, 4 Sep 2025 10:31:23 +0200 Subject: [PATCH 3/4] feat: add ubuntu test --- .github/workflows/test.yml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 730b5b8..d7c85e1 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -53,14 +53,14 @@ jobs: ls -lrt images/Dappnode-debian-*.iso # Create Ubuntu ISO - # - name: create Ubuntu ISO - # run: | - # export BASE_OS=ubuntu - # export UNATTENDED=true - # docker compose up --build - # ls images/ + - name: create Ubuntu ISO + run: | + export BASE_OS=ubuntu + export UNATTENDED=true + docker compose up --build + ls images/ # Verify Ubuntu ISO creation - # - name: verify Ubuntu ISO - # run: | - # ls -lrt images/Dappnode-ubuntu-*.iso + - name: verify Ubuntu ISO + run: | + ls -lrt images/Dappnode-ubuntu-*.iso From bcea8a4d85d66c6cc44286dea45e06ac44900bca Mon Sep 17 00:00:00 2001 From: pablomendezroyo Date: Thu, 4 Sep 2025 10:45:20 +0200 Subject: [PATCH 4/4] bump ubuntu to 0.3 --- iso/scripts/generate_dappnode_iso_ubuntu.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/iso/scripts/generate_dappnode_iso_ubuntu.sh b/iso/scripts/generate_dappnode_iso_ubuntu.sh index 6b64968..c1c1a27 100755 --- a/iso/scripts/generate_dappnode_iso_ubuntu.sh +++ b/iso/scripts/generate_dappnode_iso_ubuntu.sh @@ -5,10 +5,10 @@ SCRIPTS_DIR=$(dirname "${BASH_SOURCE[0]}") source ${SCRIPTS_DIR}/common_iso_generation.sh -BASE_ISO_NAME=ubuntu-24.04.2-live-server-amd64.iso +BASE_ISO_NAME=ubuntu-24.04.3-live-server-amd64.iso BASE_ISO_PATH="/images/${BASE_ISO_NAME}" BASE_ISO_URL="https://releases.ubuntu.com/24.04/${BASE_ISO_NAME}" -BASE_ISO_SHASUM="d6dab0c3a657988501b4bd76f1297c053df710e06e0c3aece60dead24f270b4d ${BASE_ISO_PATH}" +BASE_ISO_SHASUM="c3514bf0056180d09376462a7a1b4f213c1d6e8ea67fae5c25099c6fd3d8274b ${BASE_ISO_PATH}" DAPPNODE_ISO_NAME="${DAPPNODE_ISO_PREFIX}${BASE_ISO_NAME}" DAPPNODE_ISO_PATH="/images/${DAPPNODE_ISO_NAME}"