Skip to content

Commit 6038eeb

Browse files
M03EDImMohammad20000
authored andcommitted
fix(workflow): ghcr.io build
1 parent 0d9c26e commit 6038eeb

File tree

2 files changed

+24
-28
lines changed

2 files changed

+24
-28
lines changed

.github/workflows/build-dev.yml

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,7 @@ on:
77
- "next"
88

99
env:
10-
IMAGE: pasarguard/${{ github.event.repository.name }}:${{ github.ref_name }}
11-
GHCR_IMAGE: ghcr.io/pasarguard/${{ github.event.repository.name }}:${{ github.ref_name }}
10+
IMAGE_NAME: pasarguard/${{ github.event.repository.name }}
1211

1312
jobs:
1413
build-dashboard:
@@ -83,8 +82,8 @@ jobs:
8382
push: true
8483
file: ./Dockerfile
8584
tags: |
86-
${{ env.IMAGE }}-${{ matrix.arch }}
87-
${{ env.GHCR_IMAGE }}-${{ matrix.arch }}
85+
${{ env.IMAGE_NAME }}:${{ github.ref_name }}-${{ matrix.arch }}
86+
ghcr.io/${{ env.IMAGE_NAME }}:${{ github.ref_name }}-${{ matrix.arch }}
8887
cache-from: type=gha
8988
cache-to: type=gha,mode=max
9089

@@ -108,15 +107,15 @@ jobs:
108107
- name: Create tagged manifest
109108
uses: int128/docker-manifest-create-action@v2
110109
with:
111-
tags: ${{ env.IMAGE }}
110+
tags: ${{ env.IMAGE_NAME }}:${{ github.ref_name }}
112111
sources: |
113-
${{ env.IMAGE }}-amd64
114-
${{ env.IMAGE }}-arm64
112+
${{ env.IMAGE_NAME }}:${{ github.ref_name }}-amd64
113+
${{ env.IMAGE_NAME }}:${{ github.ref_name }}-arm64
115114
116115
- name: Create tagged manifest for GitHub
117116
uses: int128/docker-manifest-create-action@v2
118117
with:
119-
tags: ${{ env.GHCR_IMAGE }}
118+
tags: ghcr.io/${{ env.IMAGE_NAME }}:${{ github.ref_name }}
120119
sources: |
121-
${{ env.GHCR_IMAGE }}-amd64
122-
${{ env.GHCR_IMAGE }}-arm64
120+
ghcr.io/${{ env.IMAGE_NAME }}:${{ github.ref_name }}-amd64
121+
ghcr.io/${{ env.IMAGE_NAME }}:${{ github.ref_name }}-arm64

.github/workflows/build.yml

Lines changed: 15 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,7 @@ on:
55
types: [created]
66

77
env:
8-
IMAGE: pasarguard/${{ github.event.repository.name }}:${{ github.ref_name }}
9-
GHCR_IMAGE: ghcr.io/pasarguard/${{ github.event.repository.name }}:${{ github.ref_name }}
10-
IMAGE_LATEST: pasarguard/${{ github.event.repository.name }}:latest
11-
GHCR_IMAGE_LATEST: ghcr.io/pasarguard/${{ github.event.repository.name }}:latest
8+
IMAGE_NAME: pasarguard/${{ github.event.repository.name }}
129

1310
jobs:
1411
build-dashboard:
@@ -83,8 +80,8 @@ jobs:
8380
push: true
8481
file: ./Dockerfile
8582
tags: |
86-
${{ env.IMAGE }}-${{ matrix.arch }}
87-
${{ env.GHCR_IMAGE }}-${{ matrix.arch }}
83+
${{ env.IMAGE_NAME }}:${{ github.ref_name }}-${{ matrix.arch }}
84+
ghcr.io/${{ env.IMAGE_NAME }}:${{ github.ref_name }}-${{ matrix.arch }}
8885
cache-from: type=gha
8986
cache-to: type=gha,mode=max
9087

@@ -108,33 +105,33 @@ jobs:
108105
- name: Create tagged manifest
109106
uses: int128/docker-manifest-create-action@v2
110107
with:
111-
tags: ${{ env.IMAGE }}
108+
tags: ${{ env.IMAGE_NAME }}:${{ github.ref_name }}
112109
sources: |
113-
${{ env.IMAGE }}-amd64
114-
${{ env.IMAGE }}-arm64
110+
${{ env.IMAGE_NAME }}:${{ github.ref_name }}-amd64
111+
${{ env.IMAGE_NAME }}:${{ github.ref_name }}-arm64
115112
116113
- name: Create tagged manifest for GitHub
117114
uses: int128/docker-manifest-create-action@v2
118115
with:
119-
tags: ${{ env.GHCR_IMAGE }}
116+
tags: ghcr.io/${{ env.IMAGE_NAME }}:${{ github.ref_name }}
120117
sources: |
121-
${{ env.GHCR_IMAGE }}-amd64
122-
${{ env.GHCR_IMAGE }}-arm64
118+
ghcr.io/${{ env.IMAGE_NAME }}:${{ github.ref_name }}-amd64
119+
ghcr.io/${{ env.IMAGE_NAME }}:${{ github.ref_name }}-arm64
123120
124121
- name: Create latest manifest if not prerelease
125122
if: ${{ github.event.release.prerelease != true }}
126123
uses: int128/docker-manifest-create-action@v2
127124
with:
128-
tags: ${{ env.IMAGE_LATEST }}
125+
tags: ${{ env.IMAGE_NAME }}:latest
129126
sources: |
130-
${{ env.IMAGE }}-amd64
131-
${{ env.IMAGE }}-arm64
127+
${{ env.IMAGE_NAME }}:${{ github.ref_name }}-amd64
128+
${{ env.IMAGE_NAME }}:${{ github.ref_name }}-arm64
132129
133130
- name: Create latest manifest for GitHub if not prerelease
134131
if: ${{ github.event.release.prerelease != true }}
135132
uses: int128/docker-manifest-create-action@v2
136133
with:
137-
tags: ${{ env.GHCR_IMAGE_LATEST }}
134+
tags: ghcr.io/${{ env.IMAGE_NAME }}:latest
138135
sources: |
139-
${{ env.GHCR_IMAGE }}-amd64
140-
${{ env.GHCR_IMAGE }}-arm64
136+
ghcr.io/${{ env.IMAGE_NAME }}:${{ github.ref_name }}-amd64
137+
ghcr.io/${{ env.IMAGE_NAME }}:${{ github.ref_name }}-arm64

0 commit comments

Comments
 (0)