Skip to content

Commit 87468c2

Browse files
committed
fix: 取消构建镜像,改为直接拉取
1 parent cc4875c commit 87468c2

File tree

3 files changed

+45
-20
lines changed

3 files changed

+45
-20
lines changed
Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
name: docker-image-save.yml
2+
on:
3+
workflow_call:
4+
inputs:
5+
service_name:
6+
required: true
7+
type: string
8+
9+
jobs:
10+
pull-and-save:
11+
runs-on: ubuntu-latest
12+
steps:
13+
- name: Pull Docker Image
14+
run: |
15+
LOWERCASE_REPO=$(echo "${{ github.repository_owner }}" | tr '[:upper:]' '[:lower:]')
16+
docker pull ghcr.io/$LOWERCASE_REPO/datamate-${{ inputs.service_name }}:latest
17+
docker tag ghcr.io/$LOWERCASE_REPO/datamate-${{ inputs.service_name }}:latest datamate-${{ inputs.service_name }}:latest
18+
19+
- name: Save Docker Image
20+
run: |
21+
docker save -o datamate-${{ inputs.service_name }}.tar datamate-${{ inputs.service_name }}:latest
22+
23+
- name: Upload Docker Image
24+
uses: actions/upload-artifact@v4
25+
with:
26+
name: datamate-${{ inputs.service_name }}
27+
path: datamate-${{ inputs.service_name }}.tar

.github/workflows/docker-images-reusable.yml

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -47,19 +47,7 @@ jobs:
4747
make build-${{ inputs.service_name }} VERSION=latest
4848
4949
- name: Tag & Push Docker Image
50-
if: github.event_name != 'pull_request' && !startsWith(github.workflow, 'Package')
50+
if: github.event_name != 'pull_request'
5151
run: |
5252
docker tag datamate-${{ inputs.service_name }}:latest ${{ steps.set-tag.outputs.TAGS }}
53-
docker push ${{ steps.set-tag.outputs.TAGS }}
54-
55-
- name: Save Docker Image
56-
if: startsWith(github.workflow, 'Package')
57-
run: |
58-
docker save -o datamate-${{ inputs.service_name }}.tar datamate-${{ inputs.service_name }}:latest
59-
60-
- name: Upload Docker Image
61-
if: startsWith(github.workflow, 'Package')
62-
uses: actions/upload-artifact@v4
63-
with:
64-
name: datamate-${{ inputs.service_name }}
65-
path: datamate-${{ inputs.service_name }}.tar
53+
docker push ${{ steps.set-tag.outputs.TAGS }}

.github/workflows/package.yml

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,23 +6,33 @@ on:
66
jobs:
77
backend-docker-build:
88
name: Build and Push Backend Docker Image
9-
uses: ./.github/workflows/docker-image-backend.yml
9+
uses: ./.github/workflows/docker-image-save.yml
10+
with:
11+
service_name: backend
1012

1113
frontend-docker-build:
1214
name: Build and Push Frontend Docker Image
13-
uses: ./.github/workflows/docker-image-frontend.yml
15+
uses: ./.github/workflows/docker-image-save.yml
16+
with:
17+
service_name: frontend
1418

1519
database-docker-build:
1620
name: Build and Push Database Docker Image
17-
uses: ./.github/workflows/docker-image-database.yml
21+
uses: ./.github/workflows/docker-image-save.yml
22+
with:
23+
service_name: database
1824

1925
runtime-docker-build:
2026
name: Build and Push Runtime Docker Image
21-
uses: ./.github/workflows/docker-image-runtime.yml
27+
uses: ./.github/workflows/docker-image-save.yml
28+
with:
29+
service_name: runtime
2230

2331
backend-python-docker-build:
2432
name: Build and Push Backend Python Docker Image
25-
uses: ./.github/workflows/docker-image-backend-python.yml
33+
uses: ./.github/workflows/docker-image-save.yml
34+
with:
35+
service_name: backend-python
2636

2737
package-all:
2838
needs:
@@ -54,7 +64,7 @@ jobs:
5464
- name: Upload Package
5565
uses: actions/upload-artifact@v4
5666
with:
57-
name: datamate
67+
name: DataMate
5868
include-hidden-files: true
5969
path: |
6070
deployment/

0 commit comments

Comments
 (0)