Skip to content

Commit 1dd2fed

Browse files
committed
type=oci
1 parent 7dff570 commit 1dd2fed

File tree

3 files changed

+15
-12
lines changed

3 files changed

+15
-12
lines changed

.github/workflows/build-deps.yml

+5-5
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,11 @@ jobs:
5959
with:
6060
path: run
6161
key: run-${{ runner.os }}-${{ hashFiles('./build/**') }}
62+
-
63+
name: Setup .NET SDK
64+
uses: actions/setup-dotnet@v4
65+
with:
66+
dotnet-version: '8.0.x'
6267
-
6368
name: Setup QEMU
6469
uses: docker/setup-qemu-action@v3
@@ -76,11 +81,6 @@ jobs:
7681
with:
7782
username: ${{ secrets.DOCKER_USERNAME }}
7883
password: ${{ secrets.DOCKER_PASSWORD }}
79-
-
80-
name: Setup .NET SDK
81-
uses: actions/setup-dotnet@v4
82-
with:
83-
dotnet-version: '8.0.x'
8484

8585
# -
8686
# name: '[Build Docker images]'

.github/workflows/build.yml

+5-5
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,11 @@ jobs:
5757
with:
5858
path: run
5959
key: run-${{ runner.os }}-${{ hashFiles('./build/**') }}
60+
-
61+
name: Setup .NET SDK
62+
uses: actions/setup-dotnet@v4
63+
with:
64+
dotnet-version: '8.0.x'
6065
-
6166
name: Setup QEMU
6267
uses: docker/setup-qemu-action@v3
@@ -65,11 +70,6 @@ jobs:
6570
uses: docker/setup-buildx-action@v3
6671
with:
6772
install: true
68-
-
69-
name: Setup .NET SDK
70-
uses: actions/setup-dotnet@v4
71-
with:
72-
dotnet-version: '8.0.x'
7373
-
7474
name: Login to DockerHub
7575
if: success() && env.PUSH_IMAGES == 'true'

build/build/Tasks/DockerBaseTask.cs

+5-2
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,10 @@ protected virtual void DockerImage(BuildContext context, DockerDepsImage dockerI
77
var buildSettings = GetBuildSettings(dockerImage, context.DockerRegistry);
88

99
context.DockerBuildXBuild(buildSettings, GetWorkingDir(dockerImage).ToString(), "--annotation \"org.opencontainers.image.description=GitTools build images\"");
10-
10+
context.DockerLoad(new()
11+
{
12+
Input = new FilePath("./dest.tar").FullPath,
13+
});
1114
var dockerTags = GetDockerTags(dockerImage, context.DockerRegistry, dockerImage.Architecture).ToArray();
1215

1316
if (!context.PushImages)
@@ -46,7 +49,7 @@ protected virtual DockerBuildXBuildSettings GetBuildSettings(DockerDepsImage doc
4649
Rm = true,
4750
Tag = dockerTags,
4851
Platform = [$"linux/{suffix}"],
49-
Output = ["type=docker,oci-mediatypes=true"],
52+
Output = ["type=oci,dest=./dest.tar"],
5053
Pull = true,
5154
NoCache = true,
5255
/*Label =

0 commit comments

Comments
 (0)