Merge branch 'main' into task/thdubois/wsl2-devices-doc

Author: rzr

.github/workflows/build.yml

@@ -23,16 +23,21 @@ jobs:
           | tee $GITHUB_OUTPUT
       - name: Build Docker image from sources
         run: >-
+          df -h
+          &&
           docker build
           --tag "${{ env.project-name }}:latest"
           --build-arg UNIFYSDK_GIT_REPOSITORY=${{ secrets.UNIFYSDK_GIT_REPOSITORY }}
           --build-arg UNIFYSDK_GIT_TAG=${{ secrets.UNIFYSDK_GIT_TAG }}
           .
+          &&
+          df -h
+
       - name: Extract artifacts
         run: >-
           container=$(docker create "${{ env.project-name }}:latest")
           && docker cp
-          ${container}:/usr/local/opt/${{ env.project-name }}/build/dist .
+          ${container}:/usr/local/opt/${{ env.project-name }}/dist .
       - name: Upload artifacts
         uses: actions/upload-artifact@v4
         with:

Dockerfile

@@ -1,4 +1,4 @@
-FROM debian:bookworm
+FROM debian:bookworm as builder
 
 ENV DEBIAN_FRONTEND noninteractive
 ENV LC_ALL en_US.UTF-8
@@ -25,20 +25,37 @@ WORKDIR ${workdir}
 
 RUN echo "# log: Setup system" \
   && set -x  \
+  && df -h \
   && apt-get install -y make sudo \
   && ./helper.mk help setup \
   && date -u
 
 RUN echo "# log: Build" \
   && set -x  \
   && ./helper.mk \
+  && date -u \
+  && echo "# log: Clean to only keep packages to save space" \
+  && mkdir -p dist \
+  && cd dist \
+  && unzip ../build/dist/${project}*.zip \
+  && cd - \
+  && ./helper.mk distclean \
   && date -u
 
+FROM debian:bookworm
+ENV project z-wave-protocol-controller
+ENV workdir /usr/local/opt/${project}
+COPY --from=builder ${workdir}/dist/ ${workdir}/dist/
+WORKDIR ${workdir}
+
 RUN echo "# log: Install to system" \
   && set -x  \
-  && sudo dpkg -i ./build/${project}_*/*.deb \
-  || sudo apt install -f \
-  && sudo apt-get install -y mosquitto \
+  && apt-get update \
+  && dpkg -i ./dist/${project}*/*.deb \
+  || apt install -f -y \
+  && apt-get install -y mosquitto \
+  && apt-get clean -y \
+  && rm -rf /var/lib/{apt,dpkg,cache,log}/ \
   && date -u
 
 ENTRYPOINT [ "/usr/bin/zpc" ]

cmake/modules/FindUnifySDK.cmake

@@ -34,13 +34,15 @@ file(GLOB UNIFYSDK_PATCHES
   ${PROJECT_SOURCE_DIR}/patches/UnifySDK/*.patch
 )
 
+set(ENV{GIT_LFS_SKIP_SMUDGE} "1")
 find_package(Git)
 FetchContent_Declare(
   UnifySDK
   GIT_REPOSITORY ${UNIFYSDK_GIT_REPOSITORY}
   GIT_TAG        ${UNIFYSDK_GIT_TAG}
   GIT_SUBMODULES_RECURSE True
   GIT_SHALLOW 1
+  GIT_PROGRESS True
 
   # Prevent "fatal: unable to auto-detect email address"
   GIT_CONFIG user.email=nobody@UnifySDK.localhost