Skip to content

Commit 389d09d

Browse files
dsimog01dsimog01
authored
Merge pull request #575 from dappnode/Voss-Debian-12.0.0-Test
Update Debian ISO to Debian-12.0.0
2 parents 8252e09 + e422b5b commit 389d09d

File tree

6 files changed

+41
-38
lines changed

6 files changed

+41
-38
lines changed

‎.github/workflows/artifacts.yml‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,28 +3,28 @@ on:
33
workflow_dispatch:
44
inputs:
55
core:
6-
description: "Version of the core. Must go with v (e.g v0.2.47)"
6+
description: "Version of the Core. Must be prefixed with v (e.g v0.2.47)"
77
required: true
88
dappmanager:
9-
description: "Version of the dappmanager. Only numbers"
9+
description: "Version of the Dappmanager. Only numbers"
1010
required: true
1111
wifi:
12-
description: "Version of the wifi. Only numbers"
12+
description: "Version of the WiFi Package. Only numbers"
1313
required: true
1414
bind:
15-
description: "Version of the bind. Only numbers"
15+
description: "Version of the Bind Package. Only numbers"
1616
required: true
1717
ipfs:
18-
description: "Version of the ipfs. Only numbers"
18+
description: "Version of the IPFS Package. Only numbers"
1919
required: true
2020
https:
21-
description: "Version of the https. Only numbers"
21+
description: "Version of the HTTPS Package. Only numbers"
2222
required: true
2323
wireguard:
24-
description: "Version of the wireguard. Only numbers"
24+
description: "Version of the Wireguard Package. Only numbers"
2525
required: true
2626
vpn:
27-
description: "Version of the vpn. Only numbers"
27+
description: "Version of the OpenVPN Package. Only numbers"
2828
required: true
2929

3030
env:
@@ -78,12 +78,12 @@ jobs:
7878
# Verify ISO attended created
7979
- name: Check iso attended
8080
run: |
81-
ls -lrt images/DAppNode-debian-bullseye-amd64.iso
81+
ls -lrt images/DAppNode-debian-bookworm-amd64.iso
8282
8383
# Set new name for the release asset
8484
- name: Set DAppNode attended ISO name
8585
run: |
86-
cp ./images/DAppNode-debian-bullseye-amd64.iso DAppNode-${CORE_VERSION}-debian-bullseye-amd64.iso
86+
cp ./images/DAppNode-debian-bookworm-amd64.iso DAppNode-${CORE_VERSION}-debian-bookworm-amd64.iso
8787
8888
# ISO UNATTENDED
8989
- name: Build unattended
@@ -95,12 +95,12 @@ jobs:
9595
# Verify ISO unattended was created
9696
- name: Check iso unattended
9797
run: |
98-
ls -lrt images/DAppNode-debian-bullseye-amd64.iso
98+
ls -lrt images/DAppNode-debian-bookworm-amd64.iso
9999
100100
# Set new name for the release asset
101101
- name: Set DAppNode unttended ISO name
102102
run: |
103-
cp ./images/DAppNode-debian-bullseye-amd64.iso DAppNode-${CORE_VERSION}-debian-bullseye-amd64-unattended.iso
103+
cp ./images/DAppNode-debian-bookworm-amd64.iso DAppNode-${CORE_VERSION}-debian-bookworm-amd64-unattended.iso
104104
105105
- name: Create dappnode_profile.sh
106106
run: |

‎.github/workflows/release.yml‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -3,28 +3,28 @@ on:
33
workflow_dispatch:
44
inputs:
55
core:
6-
description: "Version of the core. Must go with v (e.g v0.2.47)"
6+
description: "Version of the Core. Must be prefixed with v (e.g v0.2.47)"
77
required: true
88
dappmanager:
9-
description: "Version of the dappmanager. Only numbers"
9+
description: "Version of the Dappmanager. Only numbers"
1010
required: true
1111
wifi:
12-
description: "Version of the wifi. Only numbers"
12+
description: "Version of the WiFi Package. Only numbers"
1313
required: true
1414
bind:
15-
description: "Version of the bind. Only numbers"
15+
description: "Version of the Bind Package. Only numbers"
1616
required: true
1717
ipfs:
18-
description: "Version of the ipfs. Only numbers"
18+
description: "Version of the IPFS Package. Only numbers"
1919
required: true
2020
https:
21-
description: "Version of the https. Only numbers"
21+
description: "Version of the HTTPS Package. Only numbers"
2222
required: true
2323
wireguard:
24-
description: "Version of the wireguard. Only numbers"
24+
description: "Version of the Wireguard Package. Only numbers"
2525
required: true
2626
vpn:
27-
description: "Version of the vpn. Only numbers"
27+
description: "Version of the OpenVPN Package. Only numbers"
2828
required: true
2929

3030
env:
@@ -78,12 +78,12 @@ jobs:
7878
# Verify ISO attended created
7979
- name: Check iso attended
8080
run: |
81-
ls -lrt images/DAppNode-debian-bullseye-amd64.iso
81+
ls -lrt images/DAppNode-debian-bookworm-amd64.iso
8282
8383
# Set new name for the release asset
8484
- name: Set DAppNode attended ISO name
8585
run: |
86-
cp ./images/DAppNode-debian-bullseye-amd64.iso DAppNode-${CORE_VERSION}-debian-bullseye-amd64.iso
86+
cp ./images/DAppNode-debian-bookworm-amd64.iso DAppNode-${CORE_VERSION}-debian-bookworm-amd64.iso
8787
8888
# ISO UNATTENDED
8989
- name: Build unattended
@@ -95,12 +95,12 @@ jobs:
9595
# Verify ISO unattended was created
9696
- name: Check iso unattended
9797
run: |
98-
ls -lrt images/DAppNode-debian-bullseye-amd64.iso
98+
ls -lrt images/DAppNode-debian-bookworm-amd64.iso
9999
100100
# Set new name for the release asset
101101
- name: Set DAppNode unttended ISO name
102102
run: |
103-
cp ./images/DAppNode-debian-bullseye-amd64.iso DAppNode-${CORE_VERSION}-debian-bullseye-amd64-unattended.iso
103+
cp ./images/DAppNode-debian-bookworm-amd64.iso DAppNode-${CORE_VERSION}-debian-bookworm-amd64-unattended.iso
104104
105105
# Create profile.sh script (not able to set dot (.) before the name in the gh release asset)
106106
- name: Create dappnode_profile.sh
@@ -111,19 +111,19 @@ jobs:
111111
- name: Get SHA-256 attended
112112
id: shasum-attended
113113
run: |
114-
SHASUM_ATTENDED=$(shasum -a 256 DAppNode-${CORE_VERSION}-debian-bullseye-amd64.iso)
114+
SHASUM_ATTENDED=$(shasum -a 256 DAppNode-${CORE_VERSION}-debian-bookworm-amd64.iso)
115115
echo "::set-output name=SHASUM_ATTENDED::$SHASUM_ATTENDED"
116116
117117
- name: Get SHA-256 unattended
118118
id: shasum-unattended
119119
run: |
120-
SHASUM_UNATTENDED=$(shasum -a 256 DAppNode-${CORE_VERSION}-debian-bullseye-amd64-unattended.iso)
120+
SHASUM_UNATTENDED=$(shasum -a 256 DAppNode-${CORE_VERSION}-debian-bookworm-amd64-unattended.iso)
121121
echo "::set-output name=SHASUM_UNATTENDED::$SHASUM_UNATTENDED"
122122
123123
# Release body
124124
- name: Write release content
125125
run: |
126-
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
126+
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
127127
cat CHANGELOG.md
128128
env:
129129
SHASUM_ATTENDED: ${{ steps.shasum-attended.outputs.SHASUM_ATTENDED }}

‎.github/workflows/test.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@ jobs:
1414
steps:
1515
- name: Checkout
1616
uses: actions/checkout@v2.3.1
17-
- name: setup test environment
17+
- name: Setup Test Environment
1818
run: |
1919
sudo /bin/bash ./test/environment_setup.sh
20-
- name: install prerrequisites
20+
- name: Install Prerequisites
2121
run: |
2222
sudo /bin/bash ./scripts/dappnode_install_pre.sh UPDATE
2323
- name: Install DAppNode
@@ -45,4 +45,4 @@ jobs:
4545
ls images/
4646
- name: verify image
4747
run: |
48-
ls -lrt images/DAppNode-debian-bullseye-amd64.iso
48+
ls -lrt images/DAppNode-debian-bookworm-amd64.iso

‎iso/preseeds/preseed.cfg‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
# Preseed-example: https://www.debian.org/releases/stable/example-preseed.txt
22
# Buster preseed example: https://www.debian.org/releases/buster/example-preseed.txt
33
# Bullseye preseed example: https://www.debian.org/releases/testing/example-preseed.txt
4+
# Bookworm preseed example: https://www.debian.org/releases/bookworm/example-preseed.txt
45
### Network configuration
56
d-i hw-detect/load_firmware boolean true
67
d-i netcfg/choose_interface select auto
@@ -24,10 +25,11 @@ d-i mirror/country string manual
2425
d-i mirror/http/hostname string deb.debian.org
2526
d-i mirror/http/directory string /debian
2627
d-i mirror/http/proxy string
27-
d-i apt-setup/local0/repository string http://deb.debian.org/debian/ bullseye main contrib non-free
28+
d-i apt-setup/local0/repository string http://deb.debian.org/debian/ bookworm main contrib non-free-firmware
2829
d-i apt-setup/cdrom/set-first boolean false
2930
d-i apt-setup/cdrom/set-next boolean false
3031
d-i apt-setup/cdrom/set-failed boolean false
32+
d-i apt-setup/disable-cdrom-entries boolean true
3133
popularity-contest popularity-contest/participate boolean false
3234

3335
### Preseeding other packages

‎iso/preseeds/preseed_unattended.cfg‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
# Preseed-example: https://www.debian.org/releases/stable/example-preseed.txt
22
# Buster preseed example: https://www.debian.org/releases/buster/example-preseed.txt
33
# Bullseye preseed example: https://www.debian.org/releases/testing/example-preseed.txt
4+
# Bookworm preseed example: https://www.debian.org/releases/bookworm/example-preseed.txt
45
### Localization
56
d-i debian-installer/locale string en_US.UTF-8
67
d-i debian-installer/keymap select us
@@ -61,10 +62,11 @@ d-i mirror/country string manual
6162
d-i mirror/http/hostname string deb.debian.org
6263
d-i mirror/http/directory string /debian
6364
d-i mirror/http/proxy string
64-
d-i apt-setup/local0/repository string http://deb.debian.org/debian/ bullseye main contrib non-free
65+
d-i apt-setup/local0/repository string http://deb.debian.org/debian/ bookworm main contrib non-free-firmware
6566
d-i apt-setup/cdrom/set-first boolean false
6667
d-i apt-setup/cdrom/set-next boolean false
6768
d-i apt-setup/cdrom/set-failed boolean false
69+
d-i apt-setup/disable-cdrom-entries boolean true
6870
popularity-contest popularity-contest/participate boolean false
6971
d-i pkgsel/upgrade select none
7072

‎iso/scripts/generate_dappnode_iso_debian.sh‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
11
#!/bin/bash
22
set -e
33

4-
# Source = https://cdimage.debian.org/cdimage/unofficial/non-free/cd-including-firmware/current/amd64/iso-cd/
5-
# 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/
6-
ISO_NAME=firmware-11.5.0-amd64-netinst.iso
4+
# Source = https://cdimage.debian.org/debian-cd/12.0.0/amd64/iso-cd/debian-12.0.0-amd64-netinst.iso
5+
ISO_NAME=debian-12.0.0-amd64-netinst.iso
76
ISO_PATH="/images/${ISO_NAME}"
8-
ISO_URL=https://cdimage.debian.org/cdimage/unofficial/non-free/cd-including-firmware/archive/11.5.0+nonfree/amd64/iso-cd/
9-
SHASUM="ce1dcd1fa272976ddc387554202013e69ecf1b02b38fba4f8c35c8b12b8f521e ${ISO_PATH}"
7+
ISO_URL=https://cdimage.debian.org/debian-cd/12.0.0/amd64/iso-cd/
8+
SHASUM="3b0e9718e3653435f20d8c2124de6d363a51a1fd7f911b9ca0c6db6b3d30d53e ${ISO_PATH}"
109

1110
echo "Downloading debian ISO image: ${ISO_NAME}..."
1211
if [ ! -f ${ISO_PATH} ]; then
@@ -83,4 +82,4 @@ echo "Generating new iso..."
8382
xorriso -as mkisofs -isohybrid-mbr isolinux/isohdpfx.bin \
8483
-c isolinux/boot.cat -b isolinux/isolinux.bin -no-emul-boot -boot-load-size 4 \
8584
-boot-info-table -eltorito-alt-boot -e boot/grub/efi.img -no-emul-boot \
86-
-isohybrid-gpt-basdat -o /images/DAppNode-debian-bullseye-amd64.iso .
85+
-isohybrid-gpt-basdat -o /images/DAppNode-debian-bookworm-amd64.iso .

0 commit comments

Comments
 (0)