Revert regctl & switch BuildKit off

sixeyed · Jan 7, 2025 · a665506 · a665506
1 parent f1874c6
commit a665506
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 15 deletions.
diff --git a/.github/actions/build/action.yaml b/.github/actions/build/action.yaml
@@ -24,4 +24,5 @@ runs:
       env:
         BUILD_IMAGES: ${{ inputs.images }}
         BUILD_CHAPTERS: ${{ inputs.chapters }}
-        FILTER: ${{ inputs.filter }}
+        FILTER: ${{ inputs.filter }}
+        DOCKER_BUILDKIT: 0
diff --git a/.github/actions/push-manifests/action.yaml b/.github/actions/push-manifests/action.yaml
@@ -24,4 +24,5 @@ runs:
       env:
         BUILD_IMAGES: ${{ inputs.images }}
         BUILD_CHAPTERS: ${{ inputs.chapters }}
-        FILTER: ${{ inputs.filter }}
+        FILTER: ${{ inputs.filter }}
+        DOCKER_BUILDKIT: 0
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -153,12 +153,6 @@ jobs:
       - chapters-windows-ltsc2025
     runs-on: ubuntu-latest
     steps:
-      - uses: regclient/actions/regctl-installer@main
-      - uses: regclient/actions/regctl-login@main
-        with:
-          registry: docker.io
-          username: ${{ secrets.DOCKER_HUB_USERNAME }}
-          password: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }}
       - uses: docker/login-action@v3
         with:
           username: ${{ secrets.DOCKER_HUB_USERNAME }}

diff --git a/build/push-manifests.ps1 b/build/push-manifests.ps1
@@ -2,7 +2,6 @@ param(
     [string]$Filter=$null,
     [switch]$Images=$true,
     [switch]$Chapters=$false,
-    [switch]$UseRegctl=$true,
     [switch]$Delete=$false,
     [switch]$Pull=$false
 )
@@ -51,12 +50,7 @@ try {
         $variantList = @()
         foreach ($variant in $variants) {
             $ref = "$($image)-$variant"
-            if ($UseRegctl) {
-                $manifest = regctl manifest get $ref --format raw-body | ConvertFrom-Json
-            } 
-            else {
-                $manifest = docker manifest inspect $ref | ConvertFrom-Json
-            }
+            $manifest = docker manifest inspect $ref | ConvertFrom-Json
             if ($null -ne $manifest -and $manifest.mediaType -eq $manifestMediaType) {
                 $variantList += $ref
                 echo "** Image variant found. Will add to manifest list: $ref"