Skip to content
Merged
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
47 changes: 0 additions & 47 deletions .github/workflows/docker-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ jobs:
backend: ${{ steps.filter.outputs.backend }}
frontend: ${{ steps.filter.outputs.frontend }}
nginx: ${{ steps.filter.outputs.nginx }}
motia: ${{ steps.filter.outputs.motia }}
# admin-portal: ${{ steps.filter.outputs.admin-portal }}
steps:
- name: Checkout code
Expand All @@ -35,8 +34,6 @@ jobs:
- 'frontend/**'
nginx:
- 'nginx/**'
motia:
- 'motia/**'

build-and-push-backend:
runs-on: ubuntu-latest
Expand Down Expand Up @@ -169,49 +166,6 @@ jobs:
tags: ${{ steps.meta-nginx.outputs.tags }}
labels: ${{ steps.meta-nginx.outputs.labels }}

build-and-push-motia:
runs-on: ubuntu-latest
# needs: detect-changes
if: github.ref == 'refs/heads/main' && github.repository == 'braydenidzenga/ZettaNote'
permissions:
contents: read
packages: write
steps:
- name: Checkout code
uses: actions/checkout@v4

- name: Set lowercase repository owner
id: repo-owner
run: echo "owner_lc=${OWNER,,}" >> $GITHUB_OUTPUT
env:
OWNER: ${{ github.repository_owner }}

- name: Log in to GitHub Container Registry
uses: docker/login-action@v3
with:
registry: ${{ env.REGISTRY }}
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}

- name: Extract metadata for motia
id: meta-motia
uses: docker/metadata-action@v5
with:
images: ${{ env.REGISTRY }}/${{ steps.repo-owner.outputs.owner_lc }}/zettanote-motia
tags: |
type=ref,event=branch
type=sha,prefix={{branch}}-
type=raw,value=latest,enable=${{ github.ref == 'refs/heads/main' || github.ref == 'refs/heads/v2-CI' }}

- name: Build and push motia image
uses: docker/build-push-action@v5
with:
context: ./motia
file: ./motia/Dockerfile
push: true
tags: ${{ steps.meta-motia.outputs.tags }}
labels: ${{ steps.meta-motia.outputs.labels }}

# build-and-push-admin:
# runs-on: ubuntu-latest
# needs: detect-changes
Expand Down Expand Up @@ -282,7 +236,6 @@ jobs:
- build-and-push-backend
- build-and-push-frontend
- build-and-push-nginx
- build-and-push-motia
steps:
- name: Deploy to server via SSH
uses: appleboy/ssh-action@v1.0.3
Expand Down
7 changes: 3 additions & 4 deletions backend/.env.example
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,9 @@ CLOUDINARY_CLOUD_NAME=your_cloud_name
CLOUDINARY_API_KEY=your_cloudinary_api_key
CLOUDINARY_SECRET=your_clodinary_secret_key

# Motia Integration
USE_MOTIA=false
MOTIA_URL=http://localhost:3001
# Redis Configuration
REDIS_URL=redis://localhost:6379

# Cron Jobs (disable when using Motia)
# Cron Jobs
DISABLE_REMINDER_CRON=true
DISABLE_IMAGE_CLEANUP_CRON=true
1 change: 1 addition & 0 deletions backend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
"dependencies": {
"axios": "^1.12.2",
"bcryptjs": "^3.0.2",
"bullmq": "^5.63.0",
"cloudinary": "^2.8.0",
"cookie-parser": "^1.4.7",
"cors": "^2.8.5",
Expand Down
Loading