Merge pull request #575 from dappnode/Voss-Debian-12.0.0-Test

Update Debian ISO to Debian-12.0.0
dappnode · Jul 12, 2023 · 389d09d · 389d09d
2 parents 8252e09 + e422b5b
commit 389d09d
Show file tree

Hide file tree

Showing 6 changed files with 41 additions and 38 deletions.
diff --git a/.github/workflows/artifacts.yml b/.github/workflows/artifacts.yml
@@ -3,28 +3,28 @@ on:
   workflow_dispatch:
     inputs:
       core:
-        description: "Version of the core. Must go with v (e.g v0.2.47)"
+        description: "Version of the Core. Must be prefixed with v (e.g v0.2.47)"
         required: true
       dappmanager:
-        description: "Version of the dappmanager. Only numbers"
+        description: "Version of the Dappmanager. Only numbers"
         required: true
       wifi:
-        description: "Version of the wifi. Only numbers"
+        description: "Version of the WiFi Package. Only numbers"
         required: true
       bind:
-        description: "Version of the bind. Only numbers"
+        description: "Version of the Bind Package. Only numbers"
         required: true
       ipfs:
-        description: "Version of the ipfs. Only numbers"
+        description: "Version of the IPFS Package. Only numbers"
         required: true
       https:
-        description: "Version of the https. Only numbers"
+        description: "Version of the HTTPS Package. Only numbers"
         required: true
       wireguard:
-        description: "Version of the wireguard. Only numbers"
+        description: "Version of the Wireguard Package. Only numbers"
         required: true
       vpn:
-        description: "Version of the vpn. Only numbers"
+        description: "Version of the OpenVPN Package. Only numbers"
         required: true
 
 env:
@@ -78,12 +78,12 @@ jobs:
       # Verify ISO attended created
       - name: Check iso attended
         run: |
-          ls -lrt images/DAppNode-debian-bullseye-amd64.iso
+          ls -lrt images/DAppNode-debian-bookworm-amd64.iso
 
       # Set new name for the release asset
       - name: Set DAppNode attended ISO name
         run: |
-          cp ./images/DAppNode-debian-bullseye-amd64.iso DAppNode-${CORE_VERSION}-debian-bullseye-amd64.iso
+          cp ./images/DAppNode-debian-bookworm-amd64.iso DAppNode-${CORE_VERSION}-debian-bookworm-amd64.iso
 
       # ISO UNATTENDED
       - name: Build unattended
@@ -95,12 +95,12 @@ jobs:
       # Verify ISO unattended was created
       - name: Check iso unattended
         run: |
-          ls -lrt images/DAppNode-debian-bullseye-amd64.iso
+          ls -lrt images/DAppNode-debian-bookworm-amd64.iso
 
       # Set new name for the release asset
       - name: Set DAppNode unttended ISO name
         run: |
-          cp ./images/DAppNode-debian-bullseye-amd64.iso DAppNode-${CORE_VERSION}-debian-bullseye-amd64-unattended.iso
+          cp ./images/DAppNode-debian-bookworm-amd64.iso DAppNode-${CORE_VERSION}-debian-bookworm-amd64-unattended.iso
 
       - name: Create dappnode_profile.sh
         run: |

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -3,28 +3,28 @@ on:
   workflow_dispatch:
     inputs:
       core:
-        description: "Version of the core. Must go with v (e.g v0.2.47)"
+        description: "Version of the Core. Must be prefixed with v (e.g v0.2.47)"
         required: true
       dappmanager:
-        description: "Version of the dappmanager. Only numbers"
+        description: "Version of the Dappmanager. Only numbers"
         required: true
       wifi:
-        description: "Version of the wifi. Only numbers"
+        description: "Version of the WiFi Package. Only numbers"
         required: true
       bind:
-        description: "Version of the bind. Only numbers"
+        description: "Version of the Bind Package. Only numbers"
         required: true
       ipfs:
-        description: "Version of the ipfs. Only numbers"
+        description: "Version of the IPFS Package. Only numbers"
         required: true
       https:
-        description: "Version of the https. Only numbers"
+        description: "Version of the HTTPS Package. Only numbers"
         required: true
       wireguard:
-        description: "Version of the wireguard. Only numbers"
+        description: "Version of the Wireguard Package. Only numbers"
         required: true
       vpn:
-        description: "Version of the vpn. Only numbers"
+        description: "Version of the OpenVPN Package. Only numbers"
         required: true
 
 env:
@@ -78,12 +78,12 @@ jobs:
       # Verify ISO attended created
       - name: Check iso attended
         run: |
-          ls -lrt images/DAppNode-debian-bullseye-amd64.iso
+          ls -lrt images/DAppNode-debian-bookworm-amd64.iso
 
       # Set new name for the release asset
       - name: Set DAppNode attended ISO name
         run: |
-          cp ./images/DAppNode-debian-bullseye-amd64.iso DAppNode-${CORE_VERSION}-debian-bullseye-amd64.iso
+          cp ./images/DAppNode-debian-bookworm-amd64.iso DAppNode-${CORE_VERSION}-debian-bookworm-amd64.iso
 
       # ISO UNATTENDED
       - name: Build unattended
@@ -95,12 +95,12 @@ jobs:
       # Verify ISO unattended was created
       - name: Check iso unattended
         run: |
-          ls -lrt images/DAppNode-debian-bullseye-amd64.iso
+          ls -lrt images/DAppNode-debian-bookworm-amd64.iso
 
       # Set new name for the release asset
       - name: Set DAppNode unttended ISO name
         run: |
-          cp ./images/DAppNode-debian-bullseye-amd64.iso DAppNode-${CORE_VERSION}-debian-bullseye-amd64-unattended.iso
+          cp ./images/DAppNode-debian-bookworm-amd64.iso DAppNode-${CORE_VERSION}-debian-bookworm-amd64-unattended.iso
 
       # Create profile.sh script (not able to set dot (.) before the name in the gh release asset)
       - name: Create dappnode_profile.sh
@@ -111,19 +111,19 @@ jobs:
       - name: Get SHA-256 attended
         id: shasum-attended
         run: |
-          SHASUM_ATTENDED=$(shasum -a 256 DAppNode-${CORE_VERSION}-debian-bullseye-amd64.iso)
+          SHASUM_ATTENDED=$(shasum -a 256 DAppNode-${CORE_VERSION}-debian-bookworm-amd64.iso)
           echo "::set-output name=SHASUM_ATTENDED::$SHASUM_ATTENDED"
 
       - name: Get SHA-256 unattended
         id: shasum-unattended
         run: |
-          SHASUM_UNATTENDED=$(shasum -a 256 DAppNode-${CORE_VERSION}-debian-bullseye-amd64-unattended.iso)
+          SHASUM_UNATTENDED=$(shasum -a 256 DAppNode-${CORE_VERSION}-debian-bookworm-amd64-unattended.iso)
           echo "::set-output name=SHASUM_UNATTENDED::$SHASUM_UNATTENDED"
 
       # Release body
       - name: Write release content
         run: |
-          echo -en "# Versions\n|  Package  | Version  |\n|---|---|\nbind.dnp.dappnode.eth|${BIND_VERSION}|\n|ipfs.dnp.dappnode.eth|${IPFS_VERSION}|\n|vpn.dnp.dappnode.eth |${VPN_VERSION}|\n|dappmanager.dnp.dappnode.eth|${DAPPMANAGER_VERSION}|\n|wifi.dnp.dappnode.eth|${WIFI_VERSION}|\n|https.dnp.dappnode.eth|${HTTPS_VERSION}|\n|wireguard.dnp.dappnode.eth|${WIREGUARD_VERSION}|\n# Changes\nChanges implemented in release ${CORE_VERSION}\n# Attended version\nInstall and customize DAppNode using the attended ISO: **DAppNode-${CORE_VERSION}-debian-bullseye-amd64.iso**\n\n## ISO SHA-256 Checksum\n\`\`\`\nshasum -a 256 DAppNode-${CORE_VERSION}-debian-bullseye-amd64.iso\n${SHASUM_ATTENDED}\n\`\`\`\n# Unattended version\nInstall DAppNode easily using the unattended ISO: **DAppNode-${CORE_VERSION}-debian-bullseye-amd64-unattended.iso**\nDo a reboot right after the installation\n:warning: **Warning**: This ISO will install dappnode automatically, deleting all existing partitions in the disk\n\ndefault login data:\n - **__user__**: dappnode\n - **__password__**: dappnode.s0\n## ISO SHA-256 Checksum\n\`\`\`\nshasum -a 256 DAppNode-${CORE_VERSION}-debian-bullseye-amd64-unattended.iso\n${SHASUM_UNATTENDED}\n\`\`\`\n# DAppNode for Raspberry Pi 4 64bit\n[Instructions](https://github.com/dappnode/DAppNode/wiki/DAppNodeARM-Installation-Guide)\n\ndefault login data:\n - **__user__**: dappnode\n - **__password__**: dappnodepi" > CHANGELOG.md
+          echo -en "# Versions\n|  Package  | Version  |\n|---|---|\nbind.dnp.dappnode.eth|${BIND_VERSION}|\n|ipfs.dnp.dappnode.eth|${IPFS_VERSION}|\n|vpn.dnp.dappnode.eth |${VPN_VERSION}|\n|dappmanager.dnp.dappnode.eth|${DAPPMANAGER_VERSION}|\n|wifi.dnp.dappnode.eth|${WIFI_VERSION}|\n|https.dnp.dappnode.eth|${HTTPS_VERSION}|\n|wireguard.dnp.dappnode.eth|${WIREGUARD_VERSION}|\n# Changes\nChanges implemented in release ${CORE_VERSION}\n# Attended version\nInstall and customize DAppNode using the attended ISO: **DAppNode-${CORE_VERSION}-debian-bookworm-amd64.iso**\n\n## ISO SHA-256 Checksum\n\`\`\`\nshasum -a 256 DAppNode-${CORE_VERSION}-debian-bookworm-amd64.iso\n${SHASUM_ATTENDED}\n\`\`\`\n# Unattended version\nInstall DAppNode easily using the unattended ISO: **DAppNode-${CORE_VERSION}-debian-bookworm-amd64-unattended.iso**\nDo a reboot right after the installation\n:warning: **Warning**: This ISO will install Dappnode automatically, deleting all existing partitions on the disk\n\ndefault login data:\n - **__user__**: dappnode\n - **__password__**: dappnode.s0\n## ISO SHA-256 Checksum\n\`\`\`\nshasum -a 256 DAppNode-${CORE_VERSION}-debian-bookworm-amd64-unattended.iso\n${SHASUM_UNATTENDED}\n\`\`\`\n# DAppNode for Raspberry Pi 4 64bit\n[Instructions](https://github.com/dappnode/DAppNode/wiki/DAppNodeARM-Installation-Guide)\n\ndefault login data:\n - **__user__**: dappnode\n - **__password__**: dappnodepi" > CHANGELOG.md
           cat CHANGELOG.md
         env:
           SHASUM_ATTENDED: ${{ steps.shasum-attended.outputs.SHASUM_ATTENDED }}

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -14,10 +14,10 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/[email protected]
-      - name: setup test environment
+      - name: Setup Test Environment
         run: |
           sudo /bin/bash ./test/environment_setup.sh
-      - name: install prerrequisites
+      - name: Install Prerequisites
         run: |
           sudo /bin/bash ./scripts/dappnode_install_pre.sh UPDATE
       - name: Install DAppNode
@@ -45,4 +45,4 @@ jobs:
           ls images/
       - name: verify image
         run: |
-          ls -lrt images/DAppNode-debian-bullseye-amd64.iso
+          ls -lrt images/DAppNode-debian-bookworm-amd64.iso
diff --git a/iso/preseeds/preseed.cfg b/iso/preseeds/preseed.cfg
@@ -1,6 +1,7 @@
 # Preseed-example: https://www.debian.org/releases/stable/example-preseed.txt
 # Buster preseed example: https://www.debian.org/releases/buster/example-preseed.txt
 # Bullseye preseed example: https://www.debian.org/releases/testing/example-preseed.txt
+# Bookworm preseed example: https://www.debian.org/releases/bookworm/example-preseed.txt
 ### Network configuration
 d-i hw-detect/load_firmware boolean true
 d-i netcfg/choose_interface select auto
@@ -24,10 +25,11 @@ d-i mirror/country string manual
 d-i mirror/http/hostname string deb.debian.org
 d-i mirror/http/directory string /debian
 d-i mirror/http/proxy string
-d-i apt-setup/local0/repository string http://deb.debian.org/debian/ bullseye main contrib non-free
+d-i apt-setup/local0/repository string http://deb.debian.org/debian/ bookworm main contrib non-free-firmware
 d-i apt-setup/cdrom/set-first boolean false
 d-i apt-setup/cdrom/set-next boolean false   
 d-i apt-setup/cdrom/set-failed boolean false
+d-i apt-setup/disable-cdrom-entries boolean true
 popularity-contest popularity-contest/participate boolean false
 
 ### Preseeding other packages

diff --git a/iso/preseeds/preseed_unattended.cfg b/iso/preseeds/preseed_unattended.cfg
@@ -1,6 +1,7 @@
 # Preseed-example: https://www.debian.org/releases/stable/example-preseed.txt
 # Buster preseed example: https://www.debian.org/releases/buster/example-preseed.txt
 # Bullseye preseed example: https://www.debian.org/releases/testing/example-preseed.txt
+# Bookworm preseed example: https://www.debian.org/releases/bookworm/example-preseed.txt
 ### Localization
 d-i debian-installer/locale string en_US.UTF-8
 d-i debian-installer/keymap select us
@@ -61,10 +62,11 @@ d-i mirror/country string manual
 d-i mirror/http/hostname string deb.debian.org
 d-i mirror/http/directory string /debian
 d-i mirror/http/proxy string
-d-i apt-setup/local0/repository string http://deb.debian.org/debian/ bullseye main contrib non-free
+d-i apt-setup/local0/repository string http://deb.debian.org/debian/ bookworm main contrib non-free-firmware
 d-i apt-setup/cdrom/set-first boolean false
 d-i apt-setup/cdrom/set-next boolean false
 d-i apt-setup/cdrom/set-failed boolean false
+d-i apt-setup/disable-cdrom-entries boolean true
 popularity-contest popularity-contest/participate boolean false
 d-i pkgsel/upgrade select none
 

diff --git a/iso/scripts/generate_dappnode_iso_debian.sh b/iso/scripts/generate_dappnode_iso_debian.sh
@@ -1,12 +1,11 @@
 #!/bin/bash
 set -e
 
-# Source = https://cdimage.debian.org/cdimage/unofficial/non-free/cd-including-firmware/current/amd64/iso-cd/
-# updated permalink to archive of debian ISO: https://cdimage.debian.org/cdimage/unofficial/non-free/cd-including-firmware/archive/11.5.0+nonfree/amd64/iso-cd/
-ISO_NAME=firmware-11.5.0-amd64-netinst.iso
+# Source = https://cdimage.debian.org/debian-cd/12.0.0/amd64/iso-cd/debian-12.0.0-amd64-netinst.iso
+ISO_NAME=debian-12.0.0-amd64-netinst.iso
 ISO_PATH="/images/${ISO_NAME}"
-ISO_URL=https://cdimage.debian.org/cdimage/unofficial/non-free/cd-including-firmware/archive/11.5.0+nonfree/amd64/iso-cd/
-SHASUM="ce1dcd1fa272976ddc387554202013e69ecf1b02b38fba4f8c35c8b12b8f521e  ${ISO_PATH}"
+ISO_URL=https://cdimage.debian.org/debian-cd/12.0.0/amd64/iso-cd/
+SHASUM="3b0e9718e3653435f20d8c2124de6d363a51a1fd7f911b9ca0c6db6b3d30d53e  ${ISO_PATH}"
 
 echo "Downloading debian ISO image: ${ISO_NAME}..."
 if [ ! -f ${ISO_PATH} ]; then
@@ -83,4 +82,4 @@ echo "Generating new iso..."
 xorriso -as mkisofs -isohybrid-mbr isolinux/isohdpfx.bin \
     -c isolinux/boot.cat -b isolinux/isolinux.bin -no-emul-boot -boot-load-size 4 \
     -boot-info-table -eltorito-alt-boot -e boot/grub/efi.img -no-emul-boot \
-    -isohybrid-gpt-basdat -o /images/DAppNode-debian-bullseye-amd64.iso .
+    -isohybrid-gpt-basdat -o /images/DAppNode-debian-bookworm-amd64.iso .