diff --git a/.github/workflows/build-manager.yml b/.github/workflows/build-manager.yml index d6d9ee0..dc3ea31 100644 --- a/.github/workflows/build-manager.yml +++ b/.github/workflows/build-manager.yml @@ -4,8 +4,8 @@ on: push: branches: - 'main' -# tags: -# - 'v*' + tags: + - 'v*' jobs: docker: @@ -43,7 +43,6 @@ jobs: tags: ${{ steps.meta.outputs.tags }} labels: ${{ steps.meta.outputs.labels }} - - name: Login to GitHub Container Registry run: echo ${{ secrets.GITHUB_TOKEN }} | docker login ghcr.io -u ${{ github.actor }} --password-stdin diff --git a/.github/workflows/build-worker.yml b/.github/workflows/build-worker.yml index b73bfe8..465e8c9 100644 --- a/.github/workflows/build-worker.yml +++ b/.github/workflows/build-worker.yml @@ -3,7 +3,7 @@ name: Docker Build and Publish Worker on: push: branches: - - 'master' + - 'main' tags: - 'v*' @@ -25,25 +25,23 @@ jobs: id: meta uses: docker/metadata-action@v5 with: - #images: ${{ github.repository_NAME }}/${{ github.repository_name }} images: ${{ github.actor }}/ntask-worker -# - name: Login to DockerHub -# uses: docker/login-action@v1 -# with: -# username: ${{ github.actor }} -# password: ${{ secrets.DOCKERHUB_TOKEN }} - -# - name: Build and push docker -# id: docker_build -# uses: docker/build-push-action@v2 -# with: -# context: . -# file: ./worker/Dockerfile -# platforms: linux/amd64 -# push: true -# tags: ${{ steps.meta.outputs.tags }} -# labels: ${{ steps.meta.outputs.labels }} + - name: Login to DockerHub + uses: docker/login-action@v1 + with: + username: ${{ github.actor }} + password: ${{ secrets.DOCKERHUB_TOKEN }} + - name: Build and push docker + id: docker_build + uses: docker/build-push-action@v2 + with: + context: . + file: ./worker/Dockerfile + platforms: linux/amd64 + push: true + tags: ${{ steps.meta.outputs.tags }} + labels: ${{ steps.meta.outputs.labels }} - name: Login to GitHub Container Registry run: echo ${{ secrets.GITHUB_TOKEN }} | docker login ghcr.io -u ${{ github.actor }} --password-stdin diff --git a/README.md b/README.md index 927a05c..1de38ed 100644 --- a/README.md +++ b/README.md @@ -430,6 +430,7 @@ To generate the Swagger documentation, follow these steps: ``` This command generates the Swagger JSON and the necessary files for the Swagger UI. + ## Diagram ![nTask Diagram](./resources/nTask-diagram.png)