From ce18798f8a076696196c9b8e98766f7c47b85247 Mon Sep 17 00:00:00 2001 From: Tara Wilson Date: Sat, 22 Mar 2025 19:00:13 -0400 Subject: [PATCH] Updating deploy pipeline --- .gitea/workflows/deploy.yaml | 8 ++++---- source/ticketUI/Dockerfile | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.gitea/workflows/deploy.yaml b/.gitea/workflows/deploy.yaml index 44660d5..b02a637 100644 --- a/.gitea/workflows/deploy.yaml +++ b/.gitea/workflows/deploy.yaml @@ -44,7 +44,7 @@ jobs: path: artifacts/api PublishUI: runs-on: osx - needs: [BuildUI] + needs: [BuildUI, BuildAPI] name: Publish UI Docker Image steps: - name: Check out repository code @@ -68,11 +68,11 @@ jobs: with: context: . file: source/ticketUI/Dockerfile - push: true + push: false tags: ${{ secrets.DOCKERHUB_USERNAME }}/ticket-ui:${{ github.ref_name }} PublishAPI: runs-on: osx - needs: [BuildAPI] + needs: [BuildAPI, PublishUI] name: Publish API Docker Image steps: - name: Check out repository code @@ -96,5 +96,5 @@ jobs: with: context: . file: source/ticketAPI/Dockerfile - push: true + push: false tags: ${{ secrets.DOCKERHUB_USERNAME }}/ticket-api:${{ github.ref_name }} \ No newline at end of file diff --git a/source/ticketUI/Dockerfile b/source/ticketUI/Dockerfile index 29b6e89..cc27226 100644 --- a/source/ticketUI/Dockerfile +++ b/source/ticketUI/Dockerfile @@ -1,5 +1,5 @@ FROM nginx:latest -COPY ./nginx.conf /etc/nginx/conf.d/default.conf -COPY dist/ticket-ui /usr/share/nginx/html +COPY source/ticketUI/nginx.conf /etc/nginx/conf.d/default.conf +COPY source/ticketUI/dist/ticket-ui /usr/share/nginx/html EXPOSE 80 CMD ["nginx", "-g", "daemon off;"] \ No newline at end of file