Skip to content

Commit 6c227d9

Browse files
authored
Update docker.yml
1 parent b3c7377 commit 6c227d9

File tree

1 file changed

+19
-11
lines changed

1 file changed

+19
-11
lines changed

.github/workflows/docker.yml

Lines changed: 19 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,10 @@ concurrency:
1111
cancel-in-progress: true
1212

1313
env:
14-
REGISTRY: ghcr.io
15-
IMAGE_NAME: ${{ github.repository }}
14+
DOCKER_IMAGE_NAME: ${{ secrets.DOCKER_USERNAME }}/${{ github.event.repository.name }}
15+
DOCKER_REGISTRY: docker.io
16+
GITHUB_IMAGE_NAME: ${{ github.repository }}
17+
GITHUB_REGISTRY: ghcr.io
1618

1719
jobs:
1820
build-and-deploy:
@@ -22,23 +24,29 @@ jobs:
2224
steps:
2325
- uses: actions/checkout@v4
2426

25-
- name: Login to Registry
27+
- name: Login to ${{ env.DOCKER_REGISTRY }}
2628
uses: docker/login-action@v3
2729
with:
28-
registry: ${{ env.REGISTRY }}
30+
registry: ${{ env.DOCKER_REGISTRY }}
31+
username: ${{ secrets.DOCKER_USERNAME }}
32+
password: ${{ secrets.DOCKER_PASSWORD }}
33+
34+
- name: Login to ${{ env.GITHUB_REGISTRY }}
35+
uses: docker/login-action@v3
36+
with:
37+
registry: ${{ env.GITHUB_REGISTRY }}
2938
username: ${{ github.actor }}
3039
password: ${{ secrets.GITHUB_TOKEN }}
3140

32-
- name: Extract Metadata
33-
id: meta
34-
uses: docker/metadata-action@v5
35-
with:
36-
images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
41+
- run: echo "${{ github.ref_name }}"
3742

3843
- name: Build and Push Image
3944
uses: docker/build-push-action@v6
4045
with:
4146
context: .
4247
push: true
43-
tags: ${{ steps.meta.outputs.tags }}
44-
labels: ${{ steps.meta.outputs.labels }}
48+
tags: |
49+
${{ env.DOCKER_IMAGE_NAME }}:latest
50+
${{ env.DOCKER_IMAGE_NAME }}:${{ github.ref_name }}
51+
${{ env.GITHUB_REGISTRY }}/${{ env.GITHUB_IMAGE_NAME }}
52+
${{ env.GITHUB_REGISTRY }}/${{ env.GITHUB_IMAGE_NAME }}:${{ github.ref_name }}

0 commit comments

Comments
 (0)