Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -69,15 +69,15 @@ jobs:
- name: build qemu
run: |
bash bin/build-qemu.sh
sudo ln -s $HOME/qemu/bin/qemu-arm /usr/local/bin/qemu-arm-static
sudo ln -s $HOME/qemu/bin/qemu-aarch64 /usr/local/bin/qemu-aarch64-static

- name: build packer-builder-arm-image
run: |
bash bin/build-packer.sh

- name: Download raspberrypios 32 bits iso
- name: Download raspberrypios 64 bits iso
run: |
wget -nv https://downloads.raspberrypi.com/raspios_lite_armhf/images/raspios_lite_armhf-2024-11-19/2024-11-19-raspios-bookworm-armhf-lite.img.xz
wget -nv https://downloads.raspberrypi.com/raspios_lite_arm64/images/raspios_lite_arm64-2024-11-19/2024-11-19-raspios-bookworm-arm64-lite.img.xz

- name: build pimba image
run: |
Expand Down
1 change: 0 additions & 1 deletion bin/build-packer.sh
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ unzip "packer_${VERSION}_linux_amd64.zip" -d packer/bin
cd ${HOME}/packer/build
git clone https://github.com/solo-io/packer-plugin-arm-image.git/
cd packer-plugin-arm-image
git checkout v0.2.0
go mod download
go build
mv packer-plugin-arm-image ${HOME}/packer/bin/packer-plugin-arm-image
Expand Down
2 changes: 1 addition & 1 deletion bin/build-qemu.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
set -e

VERSION=${QEMU_VERSION:=9.1.2}
ARCHES=${QEMU_ARCHES:=arm}
ARCHES=${QEMU_ARCHES:=aarch64}
TARGETS=${QEMU_TARGETS:=$(echo $ARCHES | sed 's#$# #;s#\([^ ]*\) #\1-softmmu \1-linux-user #g')}

if echo "$VERSION $TARGETS" | cmp --silent $HOME/qemu/.build -; then
Expand Down
8 changes: 5 additions & 3 deletions packer.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,13 @@
},
"builders": [{
"type": "arm-image",
"iso_url" : "2024-11-19-raspios-bookworm-armhf-lite.img.xz",
"iso_checksum" : "1dacc70cc09162c995020ac1739ee60e6843cf2bfb393654e694e3f017d781bb",
"iso_url" : "2024-11-19-raspios-bookworm-arm64-lite.img.xz",
"iso_checksum" : "6ac3a10a1f144c7e9d1f8e568d75ca809288280a593eb6ca053e49b539f465a4",
"target_image_size" : 5368709120,
"output_filename" : "/tmp/image",
"mount_path": "{{ user `img_mount_path` }}"
"mount_path": "{{ user `img_mount_path` }}",
"disable_embedded": true,
"qemu_binary": "/usr/local/bin/qemu-aarch64-static"
}],
"provisioners": [{
"type": "shell-local",
Expand Down
2 changes: 1 addition & 1 deletion tasks/docker.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
- name: add docker package list
apt_repository:
filename: docker
repo: deb [arch=armhf] https://download.docker.com/linux/debian {{ debian_distro }} stable
repo: deb [arch=arm64] https://download.docker.com/linux/debian {{ debian_distro }} stable

- name: install packages
apt:
Expand Down
2 changes: 1 addition & 1 deletion tasks/ini2env.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
- name: Download ini2env and unpack it
unarchive:
src: https://github.com/endemics/ini2env/releases/download/v0.1.1/ini2env_0.1.1_linux_armhf.tgz
src: https://github.com/endemics/ini2env/releases/download/v0.1.1/ini2env_0.1.1_linux_arm64.tgz
remote_src: yes
dest: /usr/local/bin
owner: root
Expand Down
8 changes: 5 additions & 3 deletions test.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,9 @@
"image_type": "raspberrypi",
"target_image_size" : 5368709120,
"output_filename" : "/tmp/testimage",
"mount_path": "{{ user `img_mount_path` }}"
"mount_path": "{{ user `img_mount_path` }}",
"disable_embedded": true,
"qemu_binary": "/usr/local/bin/qemu-aarch64-static"
}],
"provisioners": [
{
Expand All @@ -26,8 +28,8 @@
"LC_ALL=C"
],
"inline": [
"curl -L https://github.com/goss-org/goss/releases/download/v{{ user `goss_version` }}/goss-linux-arm -o /tmp/goss-linux-arm && chmod a+x /tmp/goss-linux-arm",
"cd /tmp/goss && /tmp/goss-linux-arm validate --format documentation --color"
"curl -Ls https://github.com/goss-org/goss/releases/download/v{{ user `goss_version` }}/goss-linux-arm64 -o /tmp/goss-linux-arm64 && chmod a+x /tmp/goss-linux-arm64",
"cd /tmp/goss && /tmp/goss-linux-arm64 validate --format documentation --color"
]
}
],
Expand Down
Loading