CMake 3.28.1 for Debian and Ubuntu

Cache Docker layers

Author: Paulchen-Panther

.github/workflows/package.yml

@@ -73,6 +73,16 @@ jobs:
           username: ${{ github.actor }}
           password: ${{ secrets.DOCKER_CI }}
 
+      - name: Cache docker layers
+        uses: actions/cache@v4
+        with:
+          path: /tmp/.buildx-cache
+          key: ${{ github.ref }}-${{ github.sha }}
+          restore-keys: |
+            ${{ github.ref }}-${{ github.sha }}
+            ${{ github.ref }}
+            refs/head/main
+
       - name: 🐳 Set up Docker metadata
         id: docker_metadata
         uses: docker/metadata-action@v5
@@ -90,6 +100,8 @@ jobs:
             org.opencontainers.image.source=${{ github.server_url }}/hyperion.docker-ci
             org.opencontainers.image.documentation=https://docs.hyperion-project.org/
             org.opencontainers.image.licenses=MIT
+          cache-from: type=local,src=/tmp/.buildx-cache
+          cache-to: type=local,dest=/tmp/.buildx-cache
 
       - name: 👷 Build and 🚀 Push to GitHub Container/Package Registry
         uses: docker/build-push-action@v5
@@ -141,10 +153,20 @@ jobs:
       - name: 🐳 Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
 
+      - name: Cache docker layers
+        uses: actions/cache@v4
+        with:
+          path: /tmp/.buildx-cache
+          key: ${{ github.ref }}-${{ github.sha }}
+          restore-keys: |
+            ${{ github.ref }}-${{ github.sha }}
+            ${{ github.ref }}
+            refs/head/main
+
       - name: 👷 Build, 🔀 Combine and 🚀 Push to GitHub Container/Package Registry
         run: |
           echo ${{ secrets.DOCKER_CI }} | docker login ghcr.io -u ${{ github.actor }} --password-stdin
-          docker buildx build --provenance=false --push --build-arg SUITE=${{ matrix.os.codename }} --build-arg QT_VERSION=${{ matrix.qt_version }} --platform=linux/arm/v6 --tag ghcr.io/${{ env.REPOSITORY }}/debian:${{ env.IMAGE }}-armv6 --file debian-armv6 .
+          docker buildx build --provenance=false --push --cache-to type=local,dest=/tmp/.buildx-cache --cache-from type=local,src=/tmp/.buildx-cache --build-arg SUITE=${{ matrix.os.codename }} --build-arg QT_VERSION=${{ matrix.qt_version }} --platform=linux/arm/v6 --tag ghcr.io/${{ env.REPOSITORY }}/debian:${{ env.IMAGE }}-armv6 --file debian-armv6 .
           docker buildx imagetools create -t ghcr.io/${{ env.REPOSITORY }}/debian:${{ env.IMAGE }} --append ghcr.io/${{ env.REPOSITORY }}/debian:${{ env.IMAGE }}-armv6
         env:
           IMAGE: ${{ matrix.qt_version == '6' && format('{0}-qt6', matrix.os.codename) || matrix.os.codename }}

README.md

@@ -1,6 +1,4 @@
 # Docker Hyperion compilation
 [![Docker CI](https://github.com/Hyperion-Project/hyperion.docker-ci/workflows/Docker%20CI/badge.svg)](https://github.com/orgs/hyperion-project/packages)<br>
 Provides multi platform images to compile Hyperion inside a Docker container.<br>
-Images are available at https://github.com/orgs/hyperion-project/packages
-
-# TODO
+Images are available at https://github.com/orgs/hyperion-project/packages

debian-armv6

@@ -60,12 +60,21 @@ RUN $APT_INSTALL \
     libraspberrypi-dev \
     libglib2.0-dev
 
-# downgrade cmake on buster
-RUN if [ "$SUITE" = "buster" ]; then \
-    $APT_UPDATE && $APT_INSTALL  cmake=3.13.4-1 cmake-data=3.13.4-1; \
-else \
-    $APT_INSTALL cmake; \
-fi
+# compile and install cmake
+ENV CMAKE_VERSION="3.28.1"
+ENV CMAKE_URL="https://github.com/Kitware/CMake/releases/download/v${CMAKE_VERSION}/cmake-${CMAKE_VERSION}"
+RUN set -xe \
+    && mkdir -p /tmp/cmake \
+    && cd /tmp/cmake \
+    && curl -kL ${CMAKE_URL}.tar.gz | tar zxf - -C . --strip-components 1 \
+    && ./bootstrap --prefix=/usr/local \
+    && make -j $(nproc) \
+    && make install \
+    && cd \
+    && rm -rf /tmp/cmake
+
+# Show cmake version
+RUN cmake --version 
 
 # download qemu and set exec flag
 RUN curl -kL https://github.com/balena-io/qemu/releases/download/v7.0.0%2Bbalena1/qemu-7.0.0.balena1-arm.tar.gz | tar zxvf - -C . --strip-components 1 && mv qemu-arm-static /usr/bin/qemu-static && chmod +x /usr/bin/qemu-static

ubuntu_debian

@@ -71,21 +71,33 @@ RUN $APT_INSTALL \
     libssl-dev \
     libglib2.0-dev
 
-# install cmake
-# - on debian buster from buster-backports
-# - on ubuntu focal (armhf) from ubuntu bionic
-RUN if [ "$SUITE" = "buster" ]; then \
-    echo "deb http://deb.debian.org/debian buster-backports main contrib non-free" > /etc/apt/sources.list.d/buster-backports-sources.list; \
-    $APT_UPDATE && $APT_INSTALL -t buster-backports cmake; \
-    rm /etc/apt/sources.list.d/buster-backports-sources.list; \
-elif [ "$TARGETPLATFORM" = "linux/arm/v7" ] && [ "$SUITE" = "focal" ]; then \
-    echo "deb [arch=armhf] http://ports.ubuntu.com/ bionic main restricted" > /etc/apt/sources.list.d/bionic-sources.list; \
-    $APT_UPDATE && $APT_INSTALL -t bionic cmake; \
-    rm /etc/apt/sources.list.d/bionic-sources.list; \
+# Install cmake on amd64 and arm64
+# Compile and install cmake on armv7
+ENV CMAKE_VERSION="3.28.1"
+ENV CMAKE_URL="https://github.com/Kitware/CMake/releases/download/v${CMAKE_VERSION}/cmake-${CMAKE_VERSION}"
+RUN if [ "$TARGETPLATFORM" = "linux/amd64" ]; then \
+    curl -OLs ${CMAKE_URL}-linux-x86_64.sh; \
+    chmod +x cmake-${CMAKE_VERSION}-linux-x86_64.sh; \
+    ./cmake-${CMAKE_VERSION}-linux-x86_64.sh --skip-license --prefix="/usr"; \
+    rm -rf cmake-${CMAKE_VERSION}-linux-x86_64.sh; \
+elif [ "$TARGETPLATFORM" = "linux/arm64" ]; then \
+    curl -OLs ${CMAKE_URL}-linux-aarch64.sh; \
+    chmod +x cmake-${CMAKE_VERSION}-linux-aarch64.sh; \
+    ./cmake-${CMAKE_VERSION}-linux-aarch64.sh --skip-license --prefix="/usr"; \
+    rm -rf cmake-${CMAKE_VERSION}-linux-aarch64.sh; \
 else \
-    $APT_INSTALL cmake; \
+    mkdir -p /tmp/cmake; \
+    cd /tmp/cmake; \
+    curl -kL ${CMAKE_URL}.tar.gz | tar zxf - -C . --strip-components 1; \
+    ./bootstrap --prefix=/usr/local; \
+    make -j $(nproc); \
+    make install; \
+    cd && rm -rf /tmp/cmake; \
 fi
 
+# Show cmake version
+RUN cmake --version 
+
 # install X11/XCB on Ubuntu for all arch and on Debian for amd64
 # install libraspberrypi-dev on Debian for arm64/armhf
 RUN if [ "$DIST" = "ubuntu" ] || [ "$TARGETPLATFORM" = "linux/amd64" ]; then \