Attempt to get docker branch builds working

Author: dkulp

.github/workflows/docker-build.yml

@@ -25,15 +25,15 @@ jobs:
         uses: actions/checkout@v2
 
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v1
+        uses: docker/setup-qemu-action@v2
 
       # setup Docker buld action
       - name: Set up Docker Buildx
         id: buildx
-        uses: docker/setup-buildx-action@v1
+        uses: docker/setup-buildx-action@v2
 
       - name: Login to DockerHub
-        uses: docker/login-action@v1
+        uses: docker/login-action@v2
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}
@@ -59,11 +59,12 @@ jobs:
         id: extract_repository
 
       - name: Build image and push to Docker Hub 
-        uses: docker/build-push-action@v2
+        uses: docker/build-push-action@v4
         with:
           # relative path to the place where source code with Dockerfile is located
           context: .
           file: ./Docker/Dockerfile
+          build-args: "FPPBRANCH=${{ steps.extract_branch.outputs.branch }}"
           # Note: tags has to be all lower-case
           platforms: linux/amd64,linux/arm64,linux/arm/v7
           tags: ${{ env.IMAGE_REPOSITORY }}/fpp:${{ steps.extract_branch.outputs.branch }},${{ env.IMAGE_REPOSITORY }}/fpp:latest

Docker/Dockerfile

@@ -30,9 +30,12 @@ RUN ( yes | /root/buildVLC.sh ) || true
 # directory
 ARG EXTRA_INSTALL_FLAG=
 
+# branch being build
+ARG FPPBRANCH
+
 ADD ./ /opt/fpp/
 ADD SD/FPP_Install.sh /root/FPP_Install.sh
-RUN ( yes | /root/FPP_Install.sh $EXTRA_INSTALL_FLAG --skip-apt-install --skip-vlc ) || true
+RUN ( yes | /root/FPP_Install.sh $EXTRA_INSTALL_FLAG --branch ${FPPBRANCH:-master} --skip-apt-install --skip-vlc ) || true
 RUN rm -rf /tmp/*
 RUN cp /opt/fpp/etc/asoundrc.plain /root/.asoundrc
 

SD/FPP_Install.sh

@@ -47,9 +47,8 @@
 #       hardware which does not support Bullseye may have issues.
 #
 #############################################################################
-SCRIPTVER="7.0"
 FPPBRANCH=${FPPBRANCH:-"master"}
-FPPIMAGEVER="2023-02"
+FPPIMAGEVER="2023-04"
 FPPCFGVER="77"
 FPPPLATFORM="UNKNOWN"
 FPPDIR=/opt/fpp
@@ -232,6 +231,11 @@ while [ -n "$1" ]; do
             isimage=false
             shift
             ;;
+        --branch)
+            FPPBRANCH=$2
+            shift
+            shift
+            ;;
         *)
             echo "Unknown option $1" >&2
             exit 1
@@ -243,8 +247,6 @@ checkTimeAgainstUSNO
 
 #############################################################################
 echo "============================================================"
-echo "$0 v${SCRIPTVER}"
-echo ""
 echo "FPP Image Version: v${FPPIMAGEVER}"
 echo "FPP Directory    : ${FPPDIR}"
 echo "FPP Branch       : ${FPPBRANCH}"

SD/README.BBB

@@ -1,8 +1,8 @@
 # FPP BBB Images creation notes (work in progress)
 #
 # FPP images are currently based on the following Debian BeagleBone images:
-# am335x-debian-11.4-minimal-armhf-2022-09-02-2gb.img.xz
-# from https://rcn-ee.net/rootfs/bb.org/testing/2022-09-02/bullseye-minimal-armhf/
+# am335x-debian-11.6-minimal-armhf-2023-04-06-2gb.img
+# from https://rcn-ee.net/rootfs/bb.org/testing/2023-04-06/bullseye-minimal-armhf/
 #
 # The below steps (much can be run via copy/paste into a terminal) will
 # prepare the "clean image" from above to have the appropriate 

dockerBuild.sh

@@ -1,7 +1,9 @@
 #!/bin/bash
 
+FPPBRANCH=${FPPBRANCH:-"master"}
+
 # build the docker image
-docker build -t falconchristmas/fpp:latest -f Docker/Dockerfile .
+docker build -t falconchristmas/fpp:latest -f Docker/Dockerfile  --build-arg FPPBRANCH=${FPPBRANCH} .
 #or
 #docker build -t falconchristmas/fpp:latest  --build-arg EXTRA_INSTALL_FLAG=--skip-clone -f Docker/Dockerfile .