Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

minor updates #253

Open
wants to merge 8 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
8 changes: 4 additions & 4 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
sudo docker run -d --name web-app -p 3005:3000 cid0/cicd-class:latest
2 changes: 2 additions & 0 deletions apps/merchant-app/tailwind.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,6 @@ module.exports = {
extend: {},
},
plugins: [],


}
1 change: 1 addition & 0 deletions docker/Dockerfile.user
Original file line number Diff line number Diff line change
Expand Up @@ -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?
Expand Down