Skip to content

Commit 5414115

Browse files
Merge pull request #466 from furkatgofurov7/revert-prime-image-build
[release-0.7] Revert prime image building changes
2 parents 5bd6cd7 + fe46818 commit 5414115

File tree

1 file changed

+6
-24
lines changed

1 file changed

+6
-24
lines changed

.github/workflows/release.yml

+6-24
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,14 @@ on:
77

88
env:
99
TAG: ${{ github.ref_name }}
10-
GHCR_REGISTRY: ghcr.io
10+
REGISTRY: ghcr.io
1111

1212
jobs:
1313
build:
1414
runs-on: ubuntu-latest
1515
permissions:
1616
contents: read
1717
packages: write
18-
actions: read
19-
id-token: write
2018
steps:
2119
- name: Checkout
2220
uses: actions/checkout@v4
@@ -26,32 +24,16 @@ jobs:
2624
uses: actions/setup-go@v5
2725
with:
2826
go-version: '=1.21.8'
29-
- name: Docker login ghcr.io
27+
- name: Docker login
3028
uses: docker/login-action@v3
3129
with:
32-
registry: ${{ env.GHCR_REGISTRY }}
30+
registry: ${{ env.REGISTRY }}
3331
username: ${{ github.actor }}
3432
password: ${{ secrets.GITHUB_TOKEN }}
35-
- name: Build docker image for ghcr.io
33+
- name: Build docker image
3634
run: make docker-build-all TAG=${{ env.TAG }}
37-
- name: Push docker image to ghcr.io
38-
run: make docker-push-all TAG=${{ env.TAG }} PROD_REGISTRY=${{ env.GHCR_REGISTRY }}
39-
- name: Read prime registry secrets
40-
uses: rancher-eio/read-vault-secrets@main
41-
with:
42-
secrets: |
43-
secret/data/github/repo/clusterapi-forks/registry/prime/rancher/cluster-api-controller/credentials username | DOCKER_USERNAME ;
44-
secret/data/github/repo/clusterapi-forks/registry/prime/rancher/cluster-api-controller/credentials password | DOCKER_PASSWORD
45-
- name: Docker login to registry
46-
uses: docker/login-action@v3
47-
with:
48-
registry: ${{ vars.PRIME_REGISTRY }}
49-
username: ${{ env.DOCKER_USERNAME }}
50-
password: ${{ env.DOCKER_PASSWORD }}
51-
- name: Build docker image for prime registry
52-
run: make docker-build-all TAG=${{ env.TAG }}
53-
- name: Push docker image to prime registry
54-
run: make docker-push-all TAG=${{ env.TAG }} PROD_REGISTRY=${{ vars.PRIME_REGISTRY }}
35+
- name: Push docker image
36+
run: make docker-push-all TAG=${{ env.TAG }} PROD_REGISTRY=${{ env.REGISTRY }}
5537
release:
5638
runs-on: ubuntu-latest
5739
permissions:

0 commit comments

Comments
 (0)