diff --git a/.github/workflows/docker.yaml b/.github/workflows/docker.yaml index 64ae0f12..3f23e06a 100644 --- a/.github/workflows/docker.yaml +++ b/.github/workflows/docker.yaml @@ -6,14 +6,16 @@ on: - dev tags: - 'v*' + env: - # Use docker.io for Docker Hub if empty - REGISTRY: ghcr.io # github.repository as / - IMAGE_NAME: ${{ github.repository }} + IMAGE_NAME: missuo/deeplx + DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }} + DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }} + GHCR_TOKEN: ${{ secrets.GT_Token }} + GHCR_USERNAME: ${{ github.repository_owner }} jobs: - docker_build: runs-on: ubuntu-latest @@ -34,27 +36,35 @@ jobs: with: version: latest + - name: Login to DockerHub + uses: docker/login-action@v2 + with: + registry: docker.io + username: ${{ env.DOCKER_USERNAME }} + password: ${{ env.DOCKER_PASSWORD }} + - name: Login to GHCR uses: docker/login-action@v2 with: registry: ghcr.io - username: ${{ github.repository_owner }} - password: ${{ secrets.GT_Token }} - + username: ${{ env.GHCR_USERNAME }} + password: ${{ env.GHCR_TOKEN }} + - name: Docker meta id: meta uses: docker/metadata-action@v4 with: # list of Docker images to use as base name for tags - images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }} + images: | + docker.io/${{ env.IMAGE_NAME }} + ghcr.io/${{ env.IMAGE_NAME }} # generate Docker tags based on the following events/attributes tags: | type=raw,value=latest,enable=${{ startsWith(github.ref, 'refs/tags/') }} type=pep440,pattern={{raw}},enable=${{ startsWith(github.ref, 'refs/tags/') }} - tpye=raw,value=dev,enable=${{ github.ref == 'refs/heads/dev' }} + type=raw,value=dev,enable=${{ github.ref == 'refs/heads/dev' }} - - name: Build dev branch and push - if: github.ref == 'refs/heads/dev' + - name: Build and push uses: docker/build-push-action@v3 with: context: . @@ -64,15 +74,3 @@ jobs: labels: ${{ steps.meta.outputs.labels }} cache-from: type=gha cache-to: type=gha,mode=max - - - name: Build release and push - if: startsWith(github.ref, 'refs/tags/') - uses: docker/build-push-action@v3 - with: - context: . - platforms: linux/amd64,linux/arm64 - push: true - tags: ${{ steps.meta.outputs.tags }} - labels: ${{ steps.meta.outputs.labels }} - cache-from: type=gha - cache-to: type=gha,mode=max \ No newline at end of file diff --git a/.github/workflows/dockerhub.yaml b/.github/workflows/dockerhub.yaml deleted file mode 100644 index 739850c3..00000000 --- a/.github/workflows/dockerhub.yaml +++ /dev/null @@ -1,78 +0,0 @@ -name: Docker Image CI Dockerhub - -on: - push: - branches: - - dev - tags: - - 'v*' -env: - # Use docker.io for Docker Hub if empty - REGISTRY: docker.io - # github.repository as / - IMAGE_NAME: missuo/deeplx - -jobs: - - docker_build: - runs-on: ubuntu-latest - - steps: - - name: Checkout - uses: actions/checkout@v3 - with: - fetch-depth: 0 - - - name: Set up QEMU - uses: docker/setup-qemu-action@v2 - with: - platforms: all - - - name: Set up docker buildx - id: buildx - uses: docker/setup-buildx-action@v2 - with: - version: latest - - - name: Login to DockerHub - uses: docker/login-action@v2 - with: - registry: docker.io - username: ${{ secrets.DOCKER_USERNAME }} - password: ${{ secrets.DOCKER_PASSWORD }} - - - name: Docker meta - id: meta - uses: docker/metadata-action@v4 - with: - # list of Docker images to use as base name for tags - images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }} - # generate Docker tags based on the following events/attributes - tags: | - type=raw,value=latest,enable=${{ startsWith(github.ref, 'refs/tags/') }} - type=pep440,pattern={{raw}},enable=${{ startsWith(github.ref, 'refs/tags/') }} - tpye=raw,value=dev,enable=${{ github.ref == 'refs/heads/dev' }} - - - name: Build dev branch and push - if: github.ref == 'refs/heads/dev' - uses: docker/build-push-action@v3 - with: - context: . - platforms: linux/amd64,linux/arm64 - push: true - tags: ${{ steps.meta.outputs.tags }} - labels: ${{ steps.meta.outputs.labels }} - cache-from: type=gha - cache-to: type=gha,mode=max - - - name: Build release and push - if: startsWith(github.ref, 'refs/tags/') - uses: docker/build-push-action@v3 - with: - context: . - platforms: linux/amd64,linux/arm64 - push: true - tags: ${{ steps.meta.outputs.tags }} - labels: ${{ steps.meta.outputs.labels }} - cache-from: type=gha - cache-to: type=gha,mode=max \ No newline at end of file