Skip to content

Commit 41f0f50

Browse files
committed
fix: docker images build
1 parent a5f1b1c commit 41f0f50

File tree

4 files changed

+24
-20
lines changed

4 files changed

+24
-20
lines changed

.github/workflows/publish-image-agent.yml

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ permissions:
2121
env:
2222
REGISTRY: ghcr.io
2323
IMAGE_NAME: ${{ github.repository }}
24-
DOCKER_CONTEXT: .
24+
BUILD_CONTEXT: .
2525

2626
jobs:
2727
build:
@@ -32,10 +32,11 @@ jobs:
3232
- name: Checkout
3333
uses: actions/checkout@v6
3434

35+
- name: Set up QEMU
36+
uses: docker/setup-qemu-action@v3
37+
3538
- name: Set up Docker Buildx
3639
uses: docker/setup-buildx-action@v3
37-
with:
38-
driver: docker
3940

4041
- name: Log in to GHCR
4142
uses: docker/login-action@v3
@@ -91,8 +92,8 @@ jobs:
9192
- name: Build and push Runner image (container mode)
9293
uses: docker/build-push-action@v6
9394
with:
94-
context: ${{ env.DOCKER_CONTEXT }}
95-
file: ${{ env.DOCKER_CONTEXT }}/Dockerfile.runner
95+
context: ${{ env.BUILD_CONTEXT }}
96+
file: ${{ env.BUILD_CONTEXT }}/Dockerfile.runner
9697
push: true
9798
tags: ${{ steps.runner-tags.outputs.tags }}
9899
labels: ${{ steps.meta.outputs.labels }}

.github/workflows/publish-image-manager.yml

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ permissions:
2121
env:
2222
REGISTRY: ghcr.io
2323
IMAGE_NAME: ${{ github.repository }}
24-
DOCKER_CONTEXT: .
24+
BUILD_CONTEXT: .
2525

2626
jobs:
2727
build:
@@ -32,10 +32,11 @@ jobs:
3232
- name: Checkout
3333
uses: actions/checkout@v6
3434

35+
- name: Set up QEMU
36+
uses: docker/setup-qemu-action@v3
37+
3538
- name: Set up Docker Buildx
3639
uses: docker/setup-buildx-action@v3
37-
with:
38-
driver: docker
3940

4041
- name: Log in to GHCR
4142
uses: docker/login-action@v3
@@ -78,8 +79,8 @@ jobs:
7879
- name: Build and push Manager image
7980
uses: docker/build-push-action@v6
8081
with:
81-
context: ${{ env.DOCKER_CONTEXT }}
82-
file: ${{ env.DOCKER_CONTEXT }}/Dockerfile
82+
context: ${{ env.BUILD_CONTEXT }}
83+
file: ${{ env.BUILD_CONTEXT }}/Dockerfile
8384
push: true
8485
tags: ${{ steps.meta.outputs.tags }}
8586
labels: ${{ steps.meta.outputs.labels }}

.github/workflows/release-agent.yml

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ env:
1414
GO_VERSION: "1.26.0"
1515
REGISTRY: ghcr.io
1616
IMAGE_NAME: ${{ github.repository }}
17-
DOCKER_CONTEXT: .
17+
BUILD_CONTEXT: .
1818

1919
jobs:
2020
release:
@@ -38,10 +38,11 @@ jobs:
3838
- name: Run tests
3939
run: go test -v ./cmd/runner-agent/... ./internal/...
4040

41+
- name: Set up QEMU
42+
uses: docker/setup-qemu-action@v3
43+
4144
- name: Set up Docker Buildx
4245
uses: docker/setup-buildx-action@v3
43-
with:
44-
driver: docker
4546

4647
- name: Log in to Container Registry
4748
uses: docker/login-action@v3
@@ -88,8 +89,8 @@ jobs:
8889
- name: Build and push Runner Docker image (container mode)
8990
uses: docker/build-push-action@v6
9091
with:
91-
context: ${{ env.DOCKER_CONTEXT }}
92-
file: ${{ env.DOCKER_CONTEXT }}/Dockerfile.runner
92+
context: ${{ env.BUILD_CONTEXT }}
93+
file: ${{ env.BUILD_CONTEXT }}/Dockerfile.runner
9394
push: true
9495
tags: ${{ steps.runner-tags.outputs.tags }}
9596
labels: ${{ steps.meta.outputs.labels }}

.github/workflows/release-manager.yml

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ env:
1515
REGISTRY: ghcr.io
1616
IMAGE_NAME: ${{ github.repository }}
1717
# 单仓用 .;monorepo 可改为子目录
18-
DOCKER_CONTEXT: .
18+
BUILD_CONTEXT: .
1919

2020
jobs:
2121
release:
@@ -70,10 +70,11 @@ jobs:
7070
7171
# Dockerfile 内已 COPY config.yaml.example 并 sed 为 config.yaml,无需在 workflow 中准备
7272

73+
- name: Set up QEMU
74+
uses: docker/setup-qemu-action@v3
75+
7376
- name: Set up Docker Buildx
7477
uses: docker/setup-buildx-action@v3
75-
with:
76-
driver: docker
7778

7879
- name: Log in to Container Registry
7980
uses: docker/login-action@v3
@@ -105,8 +106,8 @@ jobs:
105106
- name: Build and push Manager Docker image
106107
uses: docker/build-push-action@v6
107108
with:
108-
context: ${{ env.DOCKER_CONTEXT }}
109-
file: ${{ env.DOCKER_CONTEXT }}/Dockerfile
109+
context: ${{ env.BUILD_CONTEXT }}
110+
file: ${{ env.BUILD_CONTEXT }}/Dockerfile
110111
push: true
111112
tags: ${{ steps.meta.outputs.tags }}
112113
labels: ${{ steps.meta.outputs.labels }}

0 commit comments

Comments
 (0)