diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6e7800e..4c8c051 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -17,45 +17,3 @@ jobs: run: | set -x which pnpm - - docker-build-push-test: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@main - - uses: yanhao98/semantic-release-action@main - id: semantic - - - name: Login to Docker Hub - if: steps.semantic.outputs.next_release_published == 'true' - uses: docker/login-action@v3 - with: - username: ${{ vars.DOCKERHUB_USERNAME }} - password: ${{ secrets.DOCKERHUB_TOKEN }} - - name: Login to GitHub Container Registry - if: steps.semantic.outputs.next_release_published == 'true' - uses: docker/login-action@v3 - with: - registry: ghcr.io - username: ${{ github.repository_owner }} - password: ${{ secrets.GITHUB_TOKEN }} - - - uses: yanhao98/composite-actions/docker-build-push@main - if: steps.semantic.outputs.next_release_published == 'true' - id: docker-build-push - with: - build_file: ./docker-build-push/Dockerfile - build_platforms: linux/amd64,linux/arm64 - build_push: true - build_load: false - metadata_images: | - docker.io/${{ vars.DOCKERHUB_USERNAME }}/docker-example - ghcr.io/${{ github.repository }} - metadata_tags: | - type=semver,pattern={{version}},value=${{ steps.semantic.outputs.next_release_version }} - type=semver,pattern={{major}}.{{minor}},value=${{ steps.semantic.outputs.next_release_version }} - type=semver,pattern={{major}},value=${{ steps.semantic.outputs.next_release_version }} - # - name: Check Docker image - # run: | - # set -x; - # docker images; - # docker run --rm ${{ steps.docker-build-push.outputs.imageid }} whoami; diff --git a/.github/workflows/docker-build-push.yml b/.github/workflows/docker-build-push.yml new file mode 100644 index 0000000..ff12c2f --- /dev/null +++ b/.github/workflows/docker-build-push.yml @@ -0,0 +1,55 @@ +name: docker-build-push + +on: + push: + branches: + - main + paths: + - 'docker-build-push/**' + - '.github/workflows/docker-build-push.yml' + +env: + TZ: Asia/Shanghai + +jobs: + docker-build-push-test: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@main + - uses: yanhao98/semantic-release-action@main + id: semantic + + - name: Login to Docker Hub + if: steps.semantic.outputs.next_release_published == 'true' + uses: docker/login-action@v3 + with: + username: ${{ vars.DOCKERHUB_USERNAME }} + password: ${{ secrets.DOCKERHUB_TOKEN }} + # - name: Login to GitHub Container Registry + # if: steps.semantic.outputs.next_release_published == 'true' + # uses: docker/login-action@v3 + # with: + # registry: ghcr.io + # username: ${{ github.repository_owner }} + # password: ${{ secrets.GITHUB_TOKEN }} + + - uses: yanhao98/composite-actions/docker-build-push@main + if: steps.semantic.outputs.next_release_published == 'true' + id: docker-build-push + with: + build_file: ./docker-build-push/Dockerfile + build_platforms: linux/amd64,linux/arm64 + build_push: true + build_load: false + metadata_images: | + docker.io/${{ vars.DOCKERHUB_USERNAME }}/docker-example + # ghcr.io/${{ github.repository }} + metadata_tags: | + type=semver,pattern={{version}},value=${{ steps.semantic.outputs.next_release_version }} + type=semver,pattern={{major}}.{{minor}},value=${{ steps.semantic.outputs.next_release_version }} + type=semver,pattern={{major}},value=${{ steps.semantic.outputs.next_release_version }} + # - name: Check Docker image + # run: | + # set -x; + # docker images; + # docker run --rm ${{ steps.docker-build-push.outputs.imageid }} whoami;