Skip to content

Commit a665506

Browse files
committed
Revert regctl & switch BuildKit off
1 parent f1874c6 commit a665506

File tree

4 files changed

+5
-15
lines changed

4 files changed

+5
-15
lines changed

.github/actions/build/action.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,4 +24,5 @@ runs:
2424
env:
2525
BUILD_IMAGES: ${{ inputs.images }}
2626
BUILD_CHAPTERS: ${{ inputs.chapters }}
27-
FILTER: ${{ inputs.filter }}
27+
FILTER: ${{ inputs.filter }}
28+
DOCKER_BUILDKIT: 0

.github/actions/push-manifests/action.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,4 +24,5 @@ runs:
2424
env:
2525
BUILD_IMAGES: ${{ inputs.images }}
2626
BUILD_CHAPTERS: ${{ inputs.chapters }}
27-
FILTER: ${{ inputs.filter }}
27+
FILTER: ${{ inputs.filter }}
28+
DOCKER_BUILDKIT: 0

.github/workflows/build.yaml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -153,12 +153,6 @@ jobs:
153153
- chapters-windows-ltsc2025
154154
runs-on: ubuntu-latest
155155
steps:
156-
- uses: regclient/actions/regctl-installer@main
157-
- uses: regclient/actions/regctl-login@main
158-
with:
159-
registry: docker.io
160-
username: ${{ secrets.DOCKER_HUB_USERNAME }}
161-
password: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }}
162156
- uses: docker/login-action@v3
163157
with:
164158
username: ${{ secrets.DOCKER_HUB_USERNAME }}

build/push-manifests.ps1

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ param(
22
[string]$Filter=$null,
33
[switch]$Images=$true,
44
[switch]$Chapters=$false,
5-
[switch]$UseRegctl=$true,
65
[switch]$Delete=$false,
76
[switch]$Pull=$false
87
)
@@ -51,12 +50,7 @@ try {
5150
$variantList = @()
5251
foreach ($variant in $variants) {
5352
$ref = "$($image)-$variant"
54-
if ($UseRegctl) {
55-
$manifest = regctl manifest get $ref --format raw-body | ConvertFrom-Json
56-
}
57-
else {
58-
$manifest = docker manifest inspect $ref | ConvertFrom-Json
59-
}
53+
$manifest = docker manifest inspect $ref | ConvertFrom-Json
6054
if ($null -ne $manifest -and $manifest.mediaType -eq $manifestMediaType) {
6155
$variantList += $ref
6256
echo "** Image variant found. Will add to manifest list: $ref"

0 commit comments

Comments
 (0)