Skip to content

Commit 04a7e12

Browse files
committed
test with example stage
1 parent 5842053 commit 04a7e12

1 file changed

Lines changed: 17 additions & 15 deletions

File tree

.github/workflows/build-pi-image.yml

Lines changed: 17 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -22,23 +22,25 @@ jobs:
2222

2323
- name: Create custom stage for Docker
2424
run: |
25-
mkdir -p docker-stage/{00-packages,00-run-chroot.d}
26-
echo curl > docker-stage/00-packages/01-packages
27-
cat > docker-stage/00-run-chroot.d/02-copy-compose.sh << 'EOF'
25+
mkdir -p test-stage/package-test &&
26+
{
27+
cat > test-stage/package-test/00-run-chroot.sh <<-EOF
2828
#!/bin/bash
29-
install -Dm644 $GITHUB_WORKSPACE/docker-compose.yml \
30-
${ROOTFS_DIR}/home/pi/docker-compose.yml
31-
chroot ${ROOTFS_DIR} chown pi:pi /home/pi/docker-compose.yml
32-
chmod +x ${ROOTFS_DIR}/home/pi/docker-compose.yml
29+
apt-get install -y curl
30+
curl -fsSL https://deb.nodesource.com/setup_22.x | bash -
3331
EOF
34-
chmod +x docker-stage/00-run-chroot.d/02-copy-compose.sh
35-
# c) Add empty 00-run.sh to ensure rootfs is created
36-
cat > docker-stage/00-run.sh << 'EOF'
37-
#!/bin/bash
38-
set -e
39-
echo "docker-stage 00-run.sh: minimal script to ensure rootfs is created"
32+
} &&
33+
chmod +x test-stage/package-test/00-run-chroot.sh &&
34+
echo "nodejs" > test-stage/package-test/01-packages &&
35+
{
36+
cat > test-stage/prerun.sh <<-EOF
37+
#!/bin/bash -e
38+
if [ ! -d "\${ROOTFS_DIR}" ]; then
39+
copy_previous
40+
fi
4041
EOF
41-
chmod +x docker-stage/00-run.sh
42+
} &&
43+
chmod +x test-stage/prerun.sh
4244
4345
- name: Build Raspberry Pi image
4446
uses: usimd/pi-gen-action@v1
@@ -47,7 +49,7 @@ jobs:
4749
image-name: bitbot-pi
4850
hostname: bitbot
4951
enable-ssh: 1
50-
stage-list: stage0 stage1 stage2 docker-stage
52+
stage-list: stage0 stage1 stage2 ./test-stage
5153
release: bookworm
5254
compression: zip
5355
verbose-output: true

0 commit comments

Comments
 (0)