Skip to content

Commit

Permalink
Merge pull request #254 from jason5ng32/dev
Browse files Browse the repository at this point in the history
Improvements
  • Loading branch information
jason5ng32 authored Oct 31, 2024
2 parents 8194278 + 60e24b6 commit 27cbe77
Showing 1 changed file with 16 additions and 9 deletions.
25 changes: 16 additions & 9 deletions .github/workflows/docker-image.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,13 @@
name: Docker Build and Push

on:
push:
branches: [ main ]
release:
types: [published]
workflow_dispatch:
inputs:
version:
description: 'Version tag'
required: true

jobs:
build-and-push:
Expand All @@ -18,35 +21,39 @@ jobs:
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3

# 登录到 Docker Hub
- name: Login to Docker Hub
uses: docker/login-action@v3
with:
username: ${{ secrets.DOCKER_HUB_USERNAME }}
password: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }}

# 登录到 GitHub Packages
- name: Login to GitHub Packages
uses: docker/login-action@v3
with:
registry: ghcr.io
username: ${{ github.repository_owner }}
password: ${{ secrets.GITHUB_TOKEN }}

# 从 release 事件获取版本号和日志
- name: Get the version and release notes
id: get_version
if: github.event_name == 'release'
run: |
echo "RELEASE_VERSION=${GITHUB_REF#refs/tags/}" >> $GITHUB_ENV
RELEASE_NOTES=$(gh release view ${{ env.RELEASE_VERSION }} --json body -q .body)
echo "RELEASE_NOTES=${RELEASE_NOTES}" >> $GITHUB_ENV
echo "RELEASE_VERSION=${{ github.event.release.tag_name }}" >> $GITHUB_ENV
echo "RELEASE_NOTES=${{ github.event.release.body }}" >> $GITHUB_ENV
- name: Set version for manual dispatch
if: github.event_name == 'workflow_dispatch'
run: |
echo "RELEASE_VERSION=${{ github.event.inputs.version }}" >> $GITHUB_ENV
echo "RELEASE_NOTES=Manually triggered build" >> $GITHUB_ENV
- name: Build and Push Docker Image
uses: docker/build-push-action@v5
with:
push: true
tags: |
jason5ng32/myip:latest
jason5ng32/myip:${{ env.RELEASE_VERSION }}
ghcr.io/${{ github.repository_owner }}/myip:latest
ghcr.io/${{ github.repository_owner }}/myip:${{ env.RELEASE_VERSION }}
labels: |
org.opencontainers.image.version=${{ env.RELEASE_VERSION }}
Expand Down

0 comments on commit 27cbe77

Please sign in to comment.