Skip to content

Commit 445515f

Browse files
authored
Update dockerimage.yml
1 parent f13410c commit 445515f

File tree

1 file changed

+13
-14
lines changed

1 file changed

+13
-14
lines changed

.github/workflows/dockerimage.yml

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -30,15 +30,15 @@ jobs:
3030
echo "GITHUB_TAG=${GITHUB_REF#refs/tags/}" >> $GITHUB_ENV
3131
fi
3232
33-
- name: lint dockerfile
34-
run: docker run --rm -v "$PWD/Dockerfile:/Dockerfile:ro" redcoolbeans/dockerlint
35-
3633
- name: Set up Docker QEMU
3734
uses: docker/setup-qemu-action@v2
3835
- name: Set up Docker Buildx
3936
id: buildx
4037
uses: docker/setup-buildx-action@v2
4138

39+
- name: lint dockerfile
40+
run: docker run --rm -v "$PWD/Dockerfile:/Dockerfile:ro" redcoolbeans/dockerlint
41+
4242
- name: Build and export to Docker
4343
uses: docker/build-push-action@v4
4444
with:
@@ -50,39 +50,38 @@ jobs:
5050
# run: |
5151
# docker run --rm ${{ github.repository }}:test
5252

53-
- name: Login to Docker Hub
54-
if: ${{ env.GITHUB_BRANCH == 'master' || startsWith(env.GITHUB_TAG, 'v') }}
53+
- if: ${{ env.GITHUB_BRANCH == 'master' || startsWith(env.GITHUB_TAG, 'v') }}
54+
name: Login to Docker Hub
5555
uses: docker/login-action@v2
5656
with:
5757
username: ${{ secrets.DOCKERHUB_USERNAME }}
5858
password: ${{ secrets.DOCKERHUB_PASSWORD }}
5959

60-
- name: Login to GitHub Container Registry
61-
if: ${{ env.GITHUB_BRANCH == 'master' || startsWith(env.GITHUB_TAG, 'v') }}
60+
- if: ${{ env.GITHUB_BRANCH == 'master' || startsWith(env.GITHUB_TAG, 'v') }}
61+
name: Login to GitHub Container Registry
6262
uses: docker/login-action@v2
6363
with:
6464
registry: ghcr.io
6565
username: ${{ github.actor }}
6666
password: ${{ secrets.GITHUB_TOKEN }}
6767

68-
- name: Extract metadata (tags, labels) for Docker
69-
if: ${{ env.GITHUB_BRANCH == 'master' || startsWith(env.GITHUB_TAG, 'v') }}
68+
- if: ${{ env.GITHUB_BRANCH == 'master' || startsWith(env.GITHUB_TAG, 'v') }}
69+
name: Extract metadata (tags, labels) for Docker
7070
id: meta
7171
uses: docker/metadata-action@v4
7272
with:
7373
images: |
7474
${{ github.repository }}
7575
ghcr.io/${{ github.repository }}
7676
tags: |
77-
type=schedule
77+
type=edge
7878
type=ref,event=branch
79-
type=ref,event=pr
80-
type=semver,pattern={{version}}
79+
type=semver,pattern={{major}}.{{minor}}.{{patch}}
8180
type=semver,pattern={{major}}.{{minor}}
8281
type=semver,pattern={{major}}
83-
type=sha
8482
85-
- name: Build and push Docker image
83+
- if: ${{ env.GITHUB_BRANCH == 'master' || startsWith(env.GITHUB_TAG, 'v') }}
84+
name: Build and push Docker image
8685
uses: docker/build-push-action@v4
8786
with:
8887
context: .

0 commit comments

Comments
 (0)