From a8829231cadbeb0365946b0dd56a8fe233713556 Mon Sep 17 00:00:00 2001 From: tnsoftbear Date: Sat, 17 Aug 2024 16:37:39 +0300 Subject: [PATCH] -- --- .github/workflows/publish-to-ghcr.yaml | 15 +++++++++++---- internal/app/action/loading.go | 1 - 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/.github/workflows/publish-to-ghcr.yaml b/.github/workflows/publish-to-ghcr.yaml index a0c8b8b..68834b1 100644 --- a/.github/workflows/publish-to-ghcr.yaml +++ b/.github/workflows/publish-to-ghcr.yaml @@ -8,7 +8,7 @@ on: jobs: publish-to-repo: - # if: ${{ github.event.workflow_run.conclusion == 'success' && github.event.workflow_run.head_branch == 'main' && github.event.workflow_run.event == 'push' }} + if: ${{ github.event.workflow_run.conclusion == 'success' && github.event.workflow_run.head_branch == 'main' && github.event.workflow_run.event == 'push' }} runs-on: ubuntu-latest steps: - name: Checkout code @@ -21,7 +21,14 @@ jobs: username: ${{ github.actor }} password: ${{ secrets.GITHUB_TOKEN }} + # - name: Build and push Docker image + # run: | + # docker build -t ghcr.io/${{ github.repository }}/md-ship-app:latest -f . + # docker push ghcr.io/${{ github.repository }}/md-ship-app:latest + - name: Build and push Docker image - run: | - docker build -t ghcr.io/${{ github.repository }}/my-app:latest . - docker push ghcr.io/${{ github.repository }}/my-app:latest + uses: docker/build-push-action@v3 + with: + file: ./deploy/docker/app/Dockerfile + push: true + tags: ghcr.io/${{ github.repository }}/md-ship-app:latest \ No newline at end of file diff --git a/internal/app/action/loading.go b/internal/app/action/loading.go index 6cd3596..10e7ca4 100644 --- a/internal/app/action/loading.go +++ b/internal/app/action/loading.go @@ -57,7 +57,6 @@ func FindParcelLockersByCustomerId( ctx.JSON(http.StatusInternalServerError, gin.H{"id": id, "message": err.Error()}) return } - ctx.JSON(http.StatusOK, gin.H{"parcel_lockers": parcel_lockers}) } }