Skip to content

Commit 1790807

Browse files
dinoallodinoallo
authored
Merge pull request #1219 from dinoallo/fix/workflow
use correct docker registry envs D_D_*
2 parents 5a67f90 + f5928ac commit 1790807

File tree

5 files changed

+33
-33
lines changed

5 files changed

+33
-33
lines changed

‎.github/workflows/autobuild-apps-cirun.yml‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,10 @@ jobs:
3636
run: .github/scripts/download.sh
3737
- name: Build Image
3838
env:
39-
registry: ${{ vars.D_REGISTRY_NAME }}
40-
username: ${{ vars.D_REGISTRY_REPOSITORY }}
41-
repo: ${{ vars.D_REGISTRY_REPOSITORY }}
42-
password: ${{ secrets.D_REGISTRY_TOKEN }}
39+
registry: ${{ vars.D_D_REGISTRY_NAME }}
40+
username: ${{ vars.D_D_REGISTRY_REPOSITORY }}
41+
repo: ${{ vars.D_D_REGISTRY_REPOSITORY }}
42+
password: ${{ secrets.D_D_REGISTRY_TOKEN }}
4343
app: ${{ needs.resolve-issue-var.outputs.app }}
4444
version: ${{ needs.resolve-issue-var.outputs.version }}
4545
arch: ${{ matrix.arch }}
@@ -60,10 +60,10 @@ jobs:
6060
run: .github/scripts/download.sh
6161
- name: Manifest Image
6262
env:
63-
registry: ${{ vars.D_REGISTRY_NAME }}
64-
username: ${{ vars.D_REGISTRY_REPOSITORY }}
65-
repo: ${{ vars.D_REGISTRY_REPOSITORY }}
66-
password: ${{ secrets.D_REGISTRY_TOKEN }}
63+
registry: ${{ vars.D_D_REGISTRY_NAME }}
64+
username: ${{ vars.D_D_REGISTRY_REPOSITORY }}
65+
repo: ${{ vars.D_D_REGISTRY_REPOSITORY }}
66+
password: ${{ secrets.D_D_REGISTRY_TOKEN }}
6767
app: ${{ needs.resolve-issue-var.outputs.app }}
6868
version: ${{ needs.resolve-issue-var.outputs.version }}
6969
run: .github/scripts/manifest-other.sh
@@ -84,7 +84,7 @@ jobs:
8484
issue-number: ${{ github.event.issue.number }}
8585
body: |
8686
```
87-
image docker.io/${{ vars.D_REGISTRY_REPOSITORY }}/${{ needs.resolve-issue-var.outputs.app }}:${{ needs.resolve-issue-var.outputs.version }} build successfully!
87+
image docker.io/${{ vars.D_D_REGISTRY_REPOSITORY }}/${{ needs.resolve-issue-var.outputs.app }}:${{ needs.resolve-issue-var.outputs.version }} build successfully!
8888
```
8989
9090
See: https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}

‎.github/workflows/autobuild-apps-tag.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,10 @@ jobs:
3636
3737
- name: Auto build image
3838
env:
39-
registry: ${{ vars.D_REGISTRY_NAME }}
40-
repo: ${{ vars.D_REGISTRY_REPOSITORY }}
41-
username: ${{ vars.D_REGISTRY_REPOSITORY }}
42-
password: ${{ secrets.D_REGISTRY_TOKEN }}
39+
registry: ${{ vars.D_D_REGISTRY_NAME }}
40+
repo: ${{ vars.D_D_REGISTRY_REPOSITORY }}
41+
username: ${{ vars.D_D_REGISTRY_REPOSITORY }}
42+
password: ${{ secrets.D_D_REGISTRY_TOKEN }}
4343
run: |
4444
sudo podman run -it --rm -v ${PWD}:/workspace -w /workspace quay.io/skopeo/stable:latest \
4545
sync --src docker --dest docker --all ${{ env.FROM_IMAGE }} ${registry}/${repo} \
@@ -67,6 +67,6 @@ jobs:
6767
body: |
6868
🤖 says: Hooray! The action sync image has been completed successfully. 🎉
6969
70-
${{ env.FROM_IMAGE }} to ${{ vars.D_REGISTRY_NAME }}/${{ vars.D_REGISTRY_REPOSITORY }}
70+
${{ env.FROM_IMAGE }} to ${{ vars.D_D_REGISTRY_NAME }}/${{ vars.D_D_REGISTRY_REPOSITORY }}
7171
7272
See: https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}

‎.github/workflows/autobuild-apps.yml‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,10 @@ jobs:
3636
run: .github/scripts/download.sh
3737
- name: Build Image
3838
env:
39-
registry: ${{ vars.D_REGISTRY_NAME }}
40-
username: ${{ vars.D_REGISTRY_REPOSITORY }}
41-
repo: ${{ vars.D_REGISTRY_REPOSITORY }}
42-
password: ${{ secrets.D_REGISTRY_TOKEN }}
39+
registry: ${{ vars.D_D_REGISTRY_NAME }}
40+
username: ${{ vars.D_D_REGISTRY_REPOSITORY }}
41+
repo: ${{ vars.D_D_REGISTRY_REPOSITORY }}
42+
password: ${{ secrets.D_D_REGISTRY_TOKEN }}
4343
app: ${{ needs.resolve-issue-var.outputs.app }}
4444
version: ${{ needs.resolve-issue-var.outputs.version }}
4545
arch: ${{ matrix.arch }}
@@ -60,10 +60,10 @@ jobs:
6060
run: .github/scripts/download.sh
6161
- name: Manifest Image
6262
env:
63-
registry: ${{ vars.D_REGISTRY_NAME }}
64-
username: ${{ vars.D_REGISTRY_REPOSITORY }}
65-
repo: ${{ vars.D_REGISTRY_REPOSITORY }}
66-
password: ${{ secrets.D_REGISTRY_TOKEN }}
63+
registry: ${{ vars.D_D_REGISTRY_NAME }}
64+
username: ${{ vars.D_D_REGISTRY_REPOSITORY }}
65+
repo: ${{ vars.D_D_REGISTRY_REPOSITORY }}
66+
password: ${{ secrets.D_D_REGISTRY_TOKEN }}
6767
app: ${{ needs.resolve-issue-var.outputs.app }}
6868
version: ${{ needs.resolve-issue-var.outputs.version }}
6969
run: .github/scripts/manifest-other.sh
@@ -84,7 +84,7 @@ jobs:
8484
issue-number: ${{ github.event.issue.number }}
8585
body: |
8686
```
87-
image docker.io/${{ vars.D_REGISTRY_REPOSITORY }}/${{ needs.resolve-issue-var.outputs.app }}:${{ needs.resolve-issue-var.outputs.version }} build successfully!
87+
image docker.io/${{ vars.D_D_REGISTRY_REPOSITORY }}/${{ needs.resolve-issue-var.outputs.app }}:${{ needs.resolve-issue-var.outputs.version }} build successfully!
8888
```
8989
9090
See: https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}

‎.github/workflows/autobuild-dockerfiles.yml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -42,10 +42,10 @@ jobs:
4242
uses: docker/setup-buildx-action@v1
4343
- name: Build Image
4444
env:
45-
registry: ${{ vars.D_REGISTRY_NAME }}
46-
username: ${{ vars.D_REGISTRY_REPOSITORY }}
47-
repo: ${{ vars.D_REGISTRY_REPOSITORY }}
48-
password: ${{ secrets.D_REGISTRY_TOKEN }}
45+
registry: ${{ vars.D_D_REGISTRY_NAME }}
46+
username: ${{ vars.D_D_REGISTRY_REPOSITORY }}
47+
repo: ${{ vars.D_D_REGISTRY_REPOSITORY }}
48+
password: ${{ secrets.D_D_REGISTRY_TOKEN }}
4949
app: ${{ needs.resolve-issue-var.outputs.app }}
5050
version: ${{ needs.resolve-issue-var.outputs.version }}
5151
arch: ${{ matrix.arch }}
@@ -65,10 +65,10 @@ jobs:
6565
uses: actions/checkout@v3
6666
- name: Manifest Image
6767
env:
68-
registry: ${{ vars.D_REGISTRY_NAME }}
69-
username: ${{ vars.D_REGISTRY_REPOSITORY }}
70-
repo: ${{ vars.D_REGISTRY_REPOSITORY }}
71-
password: ${{ secrets.D_REGISTRY_TOKEN }}
68+
registry: ${{ vars.D_D_REGISTRY_NAME }}
69+
username: ${{ vars.D_D_REGISTRY_REPOSITORY }}
70+
repo: ${{ vars.D_D_REGISTRY_REPOSITORY }}
71+
password: ${{ secrets.D_D_REGISTRY_TOKEN }}
7272
app: ${{ needs.resolve-issue-var.outputs.app }}
7373
version: ${{ needs.resolve-issue-var.outputs.version }}
7474
run: .github/scripts/manifest-docker.sh

‎.github/workflows/autobuild-testsealos.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@ jobs:
3333
with:
3434
type: login
3535
username: labring
36-
password: ${{ secrets.D_REGISTRY_TOKEN }}
37-
registry: ${{ vars.D_REGISTRY_NAME }}
36+
password: ${{ secrets.D_D_REGISTRY_TOKEN }}
37+
registry: ${{ vars.D_D_REGISTRY_NAME }}
3838
- name: Build sealos image by dockerfile
3939
uses: labring/sealos-action@v0.0.2
4040
with:

0 commit comments

Comments
 (0)
⚡