Implement automated tests for all images (#1529)

4 files changed, 13 insertions, 12 deletions

diff --git a/build/build-SD-rpi.sh b/build/build-SD-rpi.sh
index 256cdbe4..65a486ee 100755
--- a/build/build-SD-rpi.sh
+++ b/build/build-SD-rpi.sh
@@ -67,7 +67,7 @@ PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin \
     # install NCP
     cd /tmp/ncp-build || exit 1
     systemctl daemon-reload
-    CODE_DIR="$(pwd)" DBG=x bash install.sh
+    CODE_DIR="$(pwd)" bash install.sh
 
     # work around dhcpcd Raspbian bug
     # https://lb.raspberrypi.org/forums/viewtopic.php?t=230779
diff --git a/build/build-docker.sh b/build/build-docker.sh
index a6a35931..b6a9dede 100755
--- a/build/build-docker.sh
+++ b/build/build-docker.sh
@@ -28,6 +28,7 @@ build_arch() {
 }
 
 get_arch_args() {
+  # 1) arch 2) arch_qemu 3) suffix
 
   [[ "${1?}" =~ "x86"   ]] && { echo "amd64 x86_64 x86"; return 0; }
   [[ "$1" =~ "armhf" ]] && { echo "arm32v7 arm armhf"; return 0; }
@@ -51,7 +52,7 @@ clean_workspace() {
 
   # Pull latest image for caching
   docker pull ownyourbits/nextcloudpi
-  for target in qemu nextcloudpi debian-ncp lamp nextcloud ncp-qemu-fix
+  for target in nextcloudpi debian-ncp lamp nextcloud ncp-qemu-fix
   do
     build_arch "$target" "${release}" "${arch_args[@]}"
   done
diff --git a/build/buildlib.sh b/build/buildlib.sh
index bef36cf0..b3d278fa 100644
--- a/build/buildlib.sh
+++ b/build/buildlib.sh
@@ -31,7 +31,7 @@ function launch_install_qemu()
   sleep 10
   wait_SSH "$IP"
   launch_installation_qemu "$IP" || return 1 # uses $INSTALLATION_CODE
-  wait 
+  wait
   echo "$IMGOUT generated successfully"
 }
 
@@ -59,9 +59,9 @@ function ssh_pi()
                       -o LogLevel=quiet                  )
   type sshpass &>/dev/null && local SSHPASS=( sshpass -p$PIPASS )
   if [[ "${SSHPASS[@]}" == "" ]]; then
-    ${SSH[@]} ${PIUSER}@$IP $ARGS; 
+    ${SSH[@]} ${PIUSER}@$IP $ARGS;
   else
-    ${SSHPASS[@]} ${SSH[@]} ${PIUSER}@$IP $ARGS 
+    ${SSHPASS[@]} ${SSH[@]} ${PIUSER}@$IP $ARGS
     local RET=$?
     [[ $RET -eq 5 ]] && { ${SSH[@]} ${PIUSER}@$IP $ARGS; return $?; }
     return $RET
@@ -296,7 +296,7 @@ function download_raspbian()
 
   unzip -o "$ZIP_CACHE" && \
     mv *-raspios-*.img $IMG_CACHE && \
-    cp -v --reflink=auto $IMG_CACHE "$IMGFILE" 
+    cp -v --reflink=auto $IMG_CACHE "$IMGFILE"
 }
 
 function pack_image()
diff --git a/build/docker/Dockerfile b/build/docker/Dockerfile
index 7b6c2273..6ca995c5 100644
--- a/build/docker/Dockerfile
+++ b/build/docker/Dockerfile
@@ -1,7 +1,7 @@
-ARG arch=armhf
+ARG arch=arm32v7
 ARG arch_qemu=arm
 ARG release=bullseye
-FROM debian:${release}-slim AS qemu
+FROM --platform=linux/amd64 debian:${release}-slim AS qemu
 
 RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends qemu-user-static
 
@@ -21,7 +21,7 @@ COPY build/docker/debian-ncp/run-parts.sh /
 
 # syntax=docker/dockerfile:experimental
 
-FROM --platform=linux/${arch_qemu} debian-ncp as lamp
+FROM --platform=linux/${arch} debian-ncp as lamp
 
 LABEL maintainer="Ignacio Núñez Hernanz <nacho@ownyourbits.com>"
 
@@ -69,7 +69,7 @@ ENTRYPOINT ["/run-parts.sh"]
 
 EXPOSE 80 443
 
-FROM --platform=linux/${arch_qemu} lamp as nextcloud
+FROM --platform=linux/${arch} lamp as nextcloud
 # syntax=docker/dockerfile:experimental
 
 ARG arch_qemu
@@ -121,7 +121,7 @@ COPY build/docker/nextcloud/020nextcloud /etc/services-enabled.d/
 COPY bin/ncp-provisioning.sh /usr/local/bin/
 # syntax=docker/dockerfile:experimental
 
-FROM --platform=linux/${arch_qemu} nextcloud as nextcloudpi
+FROM --platform=linux/${arch} nextcloud as nextcloudpi
 
 ARG ncp_ver=v0.0.0
 
@@ -187,6 +187,6 @@ echo "${ncp_ver}" > /usr/local/etc/ncp-version
 
 COPY build/docker/nextcloudpi/000ncp /etc/services-enabled.d/
 
-FROM --platform=linux/${arch_qemu} nextcloudpi as ncp-qemu-fix
+FROM --platform=linux/${arch} nextcloudpi as ncp-qemu-fix
 
 RUN echo 'Mutex posixsem' >> /etc/apache2/mods-available/ssl.conf