]> git.ipfire.org Git - thirdparty/freeradius-server.git/commitdiff
docker-refresh: rebuild freeradius-build-deps.deb for self-hosted-ubuntu24
authorArran Cudbard-Bell <a.cudbardb@freeradius.org>
Fri, 22 May 2026 00:32:22 +0000 (20:32 -0400)
committerArran Cudbard-Bell <a.cudbardb@freeradius.org>
Fri, 22 May 2026 00:32:22 +0000 (20:32 -0400)
scripts/ci/docker/Dockerfile COPYs /freeradius-build-deps.deb and
/freeradius-build-deps-extra.deb into the runner host image. After the
matrix split the build step was orphaned in process-host-bases so the
files were never generated, and the docker build failed with a 'cache
key not found' on the COPY. Re-add the dep-pkg step in
process-host-bases, gated on a needs_build_deps flag on the ubuntu24
matrix entry.

.github/workflows/docker-refresh.yml

index 6bc51e45bf35794344ac0e22681e031930a9aa69..9721f19f9c4a526d2f95d3ed5b35e72c1cf1a018 100644 (file)
@@ -39,6 +39,7 @@ jobs:
             extra_tags:
               - docker.internal.networkradius.com/self-hosted
             dockerfile: scripts/ci/docker/Dockerfile
+            needs_build_deps: true
 
           #
           #  Custom dind sidecar image used by the dind-based
@@ -85,6 +86,31 @@ jobs:
           cp /usr/local/share/ca-certificates/networkradius.com.crt \
              scripts/ci/networkradius.com.crt
 
+      - name: Create build dependency package
+        if: ${{ matrix.os.needs_build_deps }}
+        env:
+          DOCKER_BASE_IMAGE: ${{ matrix.os.base_image }}
+        run: |
+          cat > build-dep-pkg.sh << EOF
+          apt-get update
+          export DEBIAN_FRONTEND=noninteractive
+          apt-get install -y --no-install-recommends build-essential devscripts equivs quilt
+          cd /work
+          debian/rules debian/control
+          mk-build-deps debian/control
+          mv freeradius-build-deps_*.deb freeradius-build-deps.deb
+          mk-build-deps scripts/ci/extra-packages.debian.control
+          mv freeradius-build-deps_1*.deb freeradius-build-deps-extra.deb
+          chown $(stat -c'%u:%g' .git) *
+          EOF
+          chmod 755 build-dep-pkg.sh
+          docker run \
+            -v ${{ github.workspace }}:/work \
+            -w /work \
+            --rm \
+            "$DOCKER_BASE_IMAGE" \
+            sh -c './build-dep-pkg.sh'
+
       - name: Build main Docker image
         env:
           DOCKER_IMAGE_NAME: ${{ matrix.os.image_name }}