ci: rename ci/Dockerfile, switch to devthefuture/dockerfile-x

Author: kwvg

.dockerignore

@@ -1,4 +1,4 @@
 **
-!contrib/containers/ci/Dockerfile
+!contrib/containers/ci/ci.Dockerfile
 !contrib/containers/deploy/Dockerfile
 !contrib/containers/develop/Dockerfile

.github/workflows/build-container.yml

@@ -45,14 +45,14 @@ jobs:
         uses: docker/build-push-action@v6
         with:
           context: ./contrib/containers/ci
-          file: ./contrib/containers/ci/Dockerfile
+          file: ./contrib/containers/ci/ci.Dockerfile
           push: true
           tags: |
-            ghcr.io/${{ steps.prepare.outputs.repo }}/dashcore-ci-runner:${{ hashFiles('./contrib/containers/ci/Dockerfile') }}
+            ghcr.io/${{ steps.prepare.outputs.repo }}/dashcore-ci-runner:${{ hashFiles('./contrib/containers/ci/ci.Dockerfile') }}
             ghcr.io/${{ steps.prepare.outputs.repo }}/dashcore-ci-runner:${{ steps.prepare.outputs.tag }}
             ghcr.io/${{ steps.prepare.outputs.repo }}/dashcore-ci-runner:latest
           cache-from: |
-            type=registry,ref=ghcr.io/${{ steps.prepare.outputs.repo }}/dashcore-ci-runner:${{ hashFiles('./contrib/containers/ci/Dockerfile') }}
+            type=registry,ref=ghcr.io/${{ steps.prepare.outputs.repo }}/dashcore-ci-runner:${{ hashFiles('./contrib/containers/ci/ci.Dockerfile') }}
             type=registry,ref=ghcr.io/${{ steps.prepare.outputs.repo }}/dashcore-ci-runner:${{ steps.prepare.outputs.tag }}
             type=registry,ref=ghcr.io/${{ steps.prepare.outputs.repo }}/dashcore-ci-runner:latest
           cache-to: type=inline

.github/workflows/build-depends.yml

@@ -70,10 +70,10 @@ jobs:
           path: |
             depends/built
             depends/${{ steps.setup.outputs.HOST }}
-          key: depends-${{ hashFiles('contrib/containers/ci/Dockerfile') }}-${{ inputs.build-target }}-${{ steps.setup.outputs.DEP_HASH }}-${{ hashFiles('depends/packages/*') }}
+          key: depends-${{ hashFiles('contrib/containers/ci/ci.Dockerfile') }}-${{ inputs.build-target }}-${{ steps.setup.outputs.DEP_HASH }}-${{ hashFiles('depends/packages/*') }}
           restore-keys: |
-            depends-${{ hashFiles('contrib/containers/ci/Dockerfile') }}-${{ inputs.build-target }}-${{ steps.setup.outputs.DEP_HASH }}-
-            depends-${{ hashFiles('contrib/containers/ci/Dockerfile') }}-${{ inputs.build-target }}-
+            depends-${{ hashFiles('contrib/containers/ci/ci.Dockerfile') }}-${{ inputs.build-target }}-${{ steps.setup.outputs.DEP_HASH }}-
+            depends-${{ hashFiles('contrib/containers/ci/ci.Dockerfile') }}-${{ inputs.build-target }}-
 
       - name: Build depends
         run: |

.github/workflows/build-src.yml

@@ -70,9 +70,9 @@ jobs:
         with:
           path: |
             /cache
-          key: ccache-${{ hashFiles('contrib/containers/ci/Dockerfile', 'depends/packages/*') }}-${{ inputs.build-target }}-${{ github.sha }}
+          key: ccache-${{ hashFiles('contrib/containers/ci/ci.Dockerfile', 'depends/packages/*') }}-${{ inputs.build-target }}-${{ github.sha }}
           restore-keys: |
-            ccache-${{ hashFiles('contrib/containers/ci/Dockerfile', 'depends/packages/*') }}-${{ inputs.build-target }}-
+            ccache-${{ hashFiles('contrib/containers/ci/ci.Dockerfile', 'depends/packages/*') }}-${{ inputs.build-target }}-
 
       - name: Build source
         run: |

.gitlab-ci.yml

@@ -29,9 +29,10 @@ builder-image:
     - echo $CI_JOB_TOKEN | docker login -u gitlab-ci-token --password-stdin $CI_REGISTRY
   script:
     - cd contrib/containers/ci
+    - export DOCKER_BUILDKIT=1
     - docker pull $CI_REGISTRY_IMAGE:builder-$CI_COMMIT_REF_SLUG || true
     - docker pull $CI_REGISTRY_IMAGE:builder-develop || true
-    - docker build --cache-from $CI_REGISTRY_IMAGE:builder-$CI_COMMIT_REF_SLUG --cache-from $CI_REGISTRY_IMAGE:builder-develop -t $CI_REGISTRY_IMAGE:builder-$CI_COMMIT_REF_SLUG -f Dockerfile .
+    - docker build --cache-from $CI_REGISTRY_IMAGE:builder-$CI_COMMIT_REF_SLUG --cache-from $CI_REGISTRY_IMAGE:builder-develop -t $CI_REGISTRY_IMAGE:builder-$CI_COMMIT_REF_SLUG -f ci.Dockerfile .
     - docker push $CI_REGISTRY_IMAGE:builder-$CI_COMMIT_REF_SLUG
 
 .build-depends-template:
@@ -56,7 +57,7 @@ builder-image:
     # Let all branches share the same cache, which is ok because the depends subsystem is able to handle this properly (it works with hashes of all scripts)
     key:
       files:
-        - contrib/containers/ci/Dockerfile
+        - contrib/containers/ci/ci.Dockerfile
       prefix: ${CI_JOB_NAME}
     paths:
       - depends/built
@@ -116,7 +117,7 @@ builder-image:
     # Let all branches share the same cache, which is ok because ccache is able to handle it
     key:
       files:
-        - contrib/containers/ci/Dockerfile
+        - contrib/containers/ci/ci.Dockerfile
       prefix: ${CI_JOB_NAME}
     paths:
       - cache/ccache

contrib/containers/ci/Dockerfile renamed to contrib/containers/ci/ci.Dockerfile

@@ -1,8 +1,6 @@
-# syntax = edrevo/dockerfile-plus
+# syntax = devthefuture/dockerfile-x
 
-FROM ubuntu:noble
-
-INCLUDE+ ci/Dockerfile
+FROM ./ci/ci.Dockerfile
 
 # The inherited Dockerfile switches to non-privileged context and we've
 # just started configuring this image, give us root access