Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
jamiesun committed Jan 29, 2024
2 parents 48ab1df + beadf0e commit 6729775
Show file tree
Hide file tree
Showing 2 changed files with 49 additions and 5 deletions.
44 changes: 44 additions & 0 deletions .github/workflows/release-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -61,3 +61,47 @@ jobs:
asset_path: ./release/toughradius_amd64
asset_name: toughradius_amd64
asset_content_type: application/octet-stream

# define job to build and publish docker image
build-and-push-docker-image:
name: Build Docker image and push to repositories
# run only when code is compiling and tests are passing
runs-on: ubuntu-latest

# steps to perform in job
steps:
- name: Checkout code
uses: actions/checkout@v3

# setup Docker buld action
- name: Set up Docker Buildx
id: buildx
uses: docker/setup-buildx-action@v2

- name: Login to DockerHub
uses: docker/login-action@v2
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}

- name: Login to Github Packages
uses: docker/login-action@v2
with:
registry: ghcr.io
username: ${{ github.actor }}
password: ${{ secrets.MY_GITHUB_TOKEN }}

- name: Build image and push to Docker Hub and GitHub Container Registry
uses: docker/build-push-action@v2
with:
# 指向带有 Dockerfile 的源代码所在位置的相对路径
context: ./
# Note: tags has to be all lower-case
tags: |
talkincode/toughradius:${{ github.ref }}
ghcr.io/talkincode/toughradius:${{ github.ref }}
# build on feature branches, push only on main branch
push: ${{ github.ref == 'refs/heads/main' }}

- name: Image digest
run: echo ${{ steps.docker_build.outputs.digest }}
10 changes: 5 additions & 5 deletions assets/buildinfo.txt
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
BuildVersion=latest v8.0.6 2024-01-29 22:03:11
BuildVersion=latest v8.0.6 2024-01-29 22:19:30
ReleaseVersion=v8.0.6
BuildTime=2024-01-29 22:03:11
BuildTime=2024-01-29 22:19:30
BuildName=toughradius
CommitID=71a775bdd04e663754497dc3dcae8dd3e42c595b
CommitDate=Mon, 29 Jan 2024 22:02:57 +0800
CommitID=4acada890722ad968bed2e40c6c1ef8c6f67da5e
CommitDate=Mon, 29 Jan 2024 22:18:54 +0800
[email protected]
CommitSubject=Update links and translations, and sort user data by username
CommitSubject=Fix bug in login functionality

0 comments on commit 6729775

Please sign in to comment.