added provisioner support

Makefile

@@ -4,13 +4,13 @@ build:
 	docker build -t image-builder-rpi .
 
 sd-image: build
-	docker run --rm --privileged -v $(shell pwd):/workspace -v /boot:/boot -v /lib/modules:/lib/modules -e CIRCLE_TAG -e VERSION image-builder-rpi
+	docker run --rm --privileged -v $(shell pwd):/workspace -v /boot:/boot -v /lib/modules:/lib/modules -e CIRCLE_TAG -e VERSION -e PROVISIONER image-builder-rpi
 
 shell: build
-	docker run -ti --privileged -v $(shell pwd):/workspace -v /boot:/boot -v /lib/modules:/lib/modules -e CIRCLE_TAG -e VERSION image-builder-rpi bash
+	docker run -ti --privileged -v $(shell pwd):/workspace -v /boot:/boot -v /lib/modules:/lib/modules -e CIRCLE_TAG -e VERSION -e PROVISIONER image-builder-rpi bash
 
 test:
-	VERSION=dirty docker run --rm -ti --privileged -v $(shell pwd):/workspace -v /boot:/boot -v /lib/modules:/lib/modules -e CIRCLE_TAG -e VERSION image-builder-rpi bash -c "unzip /workspace/hypriotos-rpi-dirty.img.zip && rspec --format documentation --color /workspace/builder/test/*_spec.rb"
+	VERSION=dirty docker run --rm -ti --privileged -v $(shell pwd):/workspace -v /boot:/boot -v /lib/modules:/lib/modules -e CIRCLE_TAG -e VERSION -e PROVISIONER image-builder-rpi bash -c "/workspace/builder/run_tests.sh"
 
 shellcheck: build
 	VERSION=dirty docker run --rm -ti -v $(shell pwd):/workspace image-builder-rpi bash -c 'shellcheck /workspace/builder/*.sh /workspace/builder/files/var/lib/cloud/scripts/per-once/*'

builder/build.sh

@@ -6,6 +6,14 @@ if [ ! -f /.dockerenv ]; then
   exit 1
 fi
 
+# Which provisioner to build with
+PROVISIONER=${PROVISIONER:=docker}
+export PROVISIONER
+if [ ! -f "/builder/provisioners/${PROVISIONER}.sh" ]; then
+  echo "${PROVISIONER} does not exist!"
+  exit 1
+fi
+
 # get versions for software that needs to be installed
 # shellcheck disable=SC1091
 source /workspace/versions.config
@@ -26,7 +34,7 @@ echo CIRCLE_TAG="${CIRCLE_TAG}"
 
 # name of the sd-image we gonna create
 HYPRIOT_IMAGE_VERSION=${VERSION:="dirty"}
-HYPRIOT_IMAGE_NAME="hypriotos-rpi-${HYPRIOT_IMAGE_VERSION}.img"
+HYPRIOT_IMAGE_NAME="hypriotos-rpi-${HYPRIOT_IMAGE_VERSION}-${PROVISIONER}.img"
 export HYPRIOT_IMAGE_VERSION
 
 # download the ready-made raw image for the RPi
@@ -73,6 +81,8 @@ mount -t sysfs none ${BUILD_PATH}/sys
 
 # modify/add image files directly
 cp -R /builder/files/* ${BUILD_PATH}/
+cp "/builder/provisioners/${PROVISIONER}.sh" ${BUILD_PATH}/provisioner.sh
+chmod 755 ${BUILD_PATH}/provisioner.sh
 
 # make our build directory the current root
 # and install the Rasberry Pi firmware, kernel packages,
@@ -96,6 +106,9 @@ tar -czf /image_with_kernel_root.tar.gz -C ${BUILD_PATH} .
 du -sh ${BUILD_PATH}
 ls -alh /image_with_kernel_*.tar.gz
 
+# enable supermin debug
+#export LIBGUESTFS_DEBUG=1 LIBGUESTFS_TRACE=1
+
 # create the image and add root base filesystem
 guestfish -a "${BUILD_RESULT_PATH}/${HYPRIOT_IMAGE_NAME}"<<_EOF_
   run

builder/chroot-script.sh

@@ -94,20 +94,13 @@ export DEST
 mkdir -p "$(dirname "${DEST}")"
 echo "nameserver 8.8.8.8" > "${DEST}"
 
-# set up Docker CE repository
-DOCKERREPO_FPR=9DC858229FC7DD38854AE2D88D81803C0EBFCD88
-DOCKERREPO_KEY_URL=https://download.docker.com/linux/raspbian/gpg
-get_gpg "${DOCKERREPO_FPR}" "${DOCKERREPO_KEY_URL}"
-
-echo "deb [arch=armhf] https://download.docker.com/linux/raspbian buster $DOCKER_CE_CHANNEL" > /etc/apt/sources.list.d/docker.list
-
-c_rehash
-
 RPI_ORG_FPR=CF8A1AF502A2AA2D763BAE7E82B129927FA3303E RPI_ORG_KEY_URL=http://archive.raspberrypi.org/debian/raspberrypi.gpg.key
 get_gpg "${RPI_ORG_FPR}" "${RPI_ORG_KEY_URL}"
 
 echo 'deb http://archive.raspberrypi.org/debian/ buster main' | tee /etc/apt/sources.list.d/raspberrypi.list
 
+c_rehash
+
 # reload package sources
 apt-get update
 apt-get upgrade -y
@@ -232,31 +225,12 @@ apt-get install -y \
 # and disable systemd-resolved - it doesn't work with cloud-init network config
 systemctl mask systemd-resolved
 
-# install docker-machine
-curl -sSL -o /usr/local/bin/docker-machine "https://github.com/docker/machine/releases/download/v${DOCKER_MACHINE_VERSION}/docker-machine-Linux-armhf"
-chmod +x /usr/local/bin/docker-machine
-
-# install bash completion for Docker Machine
-curl -sSL "https://raw.githubusercontent.com/docker/machine/v${DOCKER_MACHINE_VERSION}/contrib/completion/bash/docker-machine.bash" -o /etc/bash_completion.d/docker-machine
-
-# install docker-compose
-apt-get install -y \
-  --no-install-recommends \
-  python3 python3-pip python3-setuptools
-update-alternatives --install /usr/bin/python python /usr/bin/python3.7 2
-pip3 install "docker-compose==${DOCKER_COMPOSE_VERSION}"
-
-# install bash completion for Docker Compose
-curl -sSL "https://raw.githubusercontent.com/docker/compose/${DOCKER_COMPOSE_VERSION}/contrib/completion/bash/docker-compose" -o /etc/bash_completion.d/docker-compose
-
-# install docker-ce (w/ install-recommends)
-apt-get install -y --force-yes \
-  --no-install-recommends \
-  "docker-ce-cli=${DOCKER_CE_VERSION}" \
-  "docker-ce=${DOCKER_CE_VERSION}"
-
-# install bash completion for Docker CLI
-curl -sSL https://raw.githubusercontent.com/docker/docker-ce/master/components/cli/contrib/completion/bash/docker -o /etc/bash_completion.d/docker
+# Execute the provisioner scripts to customize the base image install
+if [ -f /provisioner.sh ]
+then
+  export ARCH=arm64
+  /bin/sh /provisioner.sh
+fi
 
 echo "Installing rpi-serial-console script"
 wget -q https://raw.githubusercontent.com/lurch/rpi-serial-console/master/rpi-serial-console -O usr/local/bin/rpi-serial-console

builder/provisioners/docker.sh

@@ -0,0 +1,38 @@
+#!/bin/sh
+
+# set up Docker CE repository
+DOCKERREPO_FPR=9DC858229FC7DD38854AE2D88D81803C0EBFCD88
+DOCKERREPO_KEY_URL=https://download.docker.com/linux/raspbian/gpg
+get_gpg "${DOCKERREPO_FPR}" "${DOCKERREPO_KEY_URL}"
+
+echo "deb [arch=armhf] https://download.docker.com/linux/raspbian buster $DOCKER_CE_CHANNEL" > /etc/apt/sources.list.d/docker.list
+
+c_rehash
+
+apt-get update -y
+
+# install docker-machine
+curl -sSL -o /usr/local/bin/docker-machine "https://github.com/docker/machine/releases/download/v${DOCKER_MACHINE_VERSION}/docker-machine-Linux-armhf"
+chmod +x /usr/local/bin/docker-machine
+
+# install bash completion for Docker Machine
+curl -sSL "https://raw.githubusercontent.com/docker/machine/v${DOCKER_MACHINE_VERSION}/contrib/completion/bash/docker-machine.bash" -o /etc/bash_completion.d/docker-machine
+
+# install docker-compose
+apt-get install -y \
+  --no-install-recommends \
+  python3 python3-pip python3-setuptools
+update-alternatives --install /usr/bin/python python /usr/bin/python3.7 2
+pip3 install "docker-compose==${DOCKER_COMPOSE_VERSION}"
+
+# install bash completion for Docker Compose
+curl -sSL "https://raw.githubusercontent.com/docker/compose/${DOCKER_COMPOSE_VERSION}/contrib/completion/bash/docker-compose" -o /etc/bash_completion.d/docker-compose
+
+# install docker-ce (w/ install-recommends)
+apt-get install -y --force-yes \
+  --no-install-recommends \
+  "docker-ce-cli=${DOCKER_CE_VERSION}" \
+  "docker-ce=${DOCKER_CE_VERSION}"
+
+# install bash completion for Docker CLI
+curl -sSL https://raw.githubusercontent.com/docker/docker-ce/master/components/cli/contrib/completion/bash/docker -o /etc/bash_completion.d/docker

builder/run_tests.sh

@@ -0,0 +1,4 @@
+#!/bin/bash
+export PROVISIONER=${PROVISIONER:=docker}
+
+unzip "/workspace/hypriotos-rpi-${VERSION}-${PROVISIONER}.img.zip" && rspec --format documentation --color /workspace/builder/test/*_spec.rb

builder/test/spec_helper.rb

@@ -2,7 +2,7 @@
 set :backend, :exec
 
 def image_path
-  return "hypriotos-rpi-#{ENV['VERSION']}.img"
+  return "hypriotos-rpi-#{ENV['VERSION']}-#{ENV['PROVISIONER']}.img"
 end
 
 def run( cmd )