diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index c8b64f0e..65f31551 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -7,19 +7,20 @@ on: jobs: build: + name: Build the project runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 - name: Use Node.js - uses: actions/setup-node@v3 + uses: actions/setup@v3 with: node-version: '20' - + - name: Install Dependencies run: npm install - + - name: Generate prisma client run: npm run db:generate - + - name: Run Build - run: npm run build + run: npm run build \ No newline at end of file diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index acbed6e5..46744f45 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -24,10 +24,10 @@ jobs: context: . file: ./docker/Dockerfile.user push: true - tags: 100xdevs/week-18-class:latest # Replace with your Docker Hub username and repository + tags: cid0/cicd-class:latest # Replace with your Docker Hub username and repository - name: Verify Pushed Image - run: docker pull 100xdevs/week-18-class:latest # Replace with your Docker Hub username and repository + run: docker pull cid0/cicd-class:latest # Replace with your Docker Hub username and repository - name: Deploy to EC2 uses: appleboy/ssh-action@master @@ -36,7 +36,7 @@ jobs: username: ${{ secrets.SSH_USERNAME }} key: ${{ secrets.SSH_KEY }} script: | - sudo docker pull 100xdevs/week-18-class:latest + sudo docker pull cid0/cicd-class:latest sudo docker stop web-app || true sudo docker rm web-app || true - sudo docker run -d --name web-app -p 3005:3000 100xdevs/week-18-class:latest \ No newline at end of file + sudo docker run -d --name web-app -p 3005:3000 cid0/cicd-class:latest diff --git a/apps/merchant-app/tailwind.config.js b/apps/merchant-app/tailwind.config.js index b68cbc55..b4754047 100644 --- a/apps/merchant-app/tailwind.config.js +++ b/apps/merchant-app/tailwind.config.js @@ -10,4 +10,6 @@ module.exports = { extend: {}, }, plugins: [], + + } \ No newline at end of file diff --git a/docker/Dockerfile.user b/docker/Dockerfile.user index d8cde5b1..d5bacb59 100644 --- a/docker/Dockerfile.user +++ b/docker/Dockerfile.user @@ -10,6 +10,7 @@ COPY packages ./packages # Install dependencies RUN npm install # Can you add a script to the global package.json that does this? +#yes and earlier it was: cd packages/db && npx prisma generate && cd ../.. RUN npm run db:generate # Can you filter the build down to just one app?