Merge branch 'code100x:main' into main

.env.example

@@ -2,7 +2,7 @@ NEXT_PUBLIC_BASE_URL_LOCAL=http://127.0.0.1:3000
 ADMIN_SECRET="ADMIN_SECRET"
 JWT_SECRET="JWT_SECRET"
 # DONT CHANGE FOR RUNNING WITH DOCKER
-DATABASE_URL="postgresql://postgres:postgres@db:5432/cms?schema=public"
+DATABASE_URL="postgresql://myuser:mypassword@localhost:5432/cms?schema=public"
 NEXTAUTH_URL="http://localhost:3000"
 APPX_AUTH_KEY="AUTH_SECRET"
 NEXTAUTH_SECRET="NEXTAUTH_SECRET"

.github/workflows/cd.yml

@@ -0,0 +1,43 @@
+name: Continuous Deployment
+on:
+  push:
+    branches: [ main ]
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+
+      - name: Docker login
+        uses: docker/login-action@v2
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
+
+      - name: Build and push
+        uses: docker/build-push-action@v4
+        with:
+          context: .
+          file: ./Dockerfile.prod
+          push: true
+          tags: 100xdevs/cms-staging:${{ github.sha }}
+          build-args: |
+            DATABASE_URL=${{ secrets.STAGING_DATABASE }}
+
+      - name: Clone staging-ops repo, update, and push
+        env:
+          PAT: ${{ secrets.PAT }}
+        run: |
+          git clone https://github.com/code100x/staging-ops.git
+          cd staging-ops
+          sed -i 's|image: 100xdevs/cms-staging:.*|image: 100xdevs/cms-staging:${{ github.sha }}|' staging/cms/deployment.yml
+          git config user.name "GitHub Actions Bot"
+          git config user.email "[email protected]"
+          git add staging/cms/deployment.yml
+          git commit -m "Update cms image to ${{ github.sha }}"
+          git push https://${PAT}@github.com/code100x/staging-ops.git main

.github/workflows/cd_prod.yml

@@ -0,0 +1,43 @@
+name: Continuous Deployment (Prod)
+on:
+  push:
+    branches: [ production ]
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+
+      - name: Docker login
+        uses: docker/login-action@v2
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
+
+      - name: Build and push
+        uses: docker/build-push-action@v4
+        with:
+          context: .
+          file: ./Dockerfile.prod
+          push: true
+          tags: 100xdevs/cms:${{ github.sha }}
+          build-args: |
+            DATABASE_URL=${{ secrets.PROD_DATABASE }} 
+
+      - name: Clone staging-ops repo, update, and push
+        env:
+          PAT: ${{ secrets.PAT }}
+        run: |
+          git clone https://github.com/code100x/staging-ops.git
+          cd staging-ops
+          sed -i 's|image: 100xdevs/cms:.*|image: 100xdevs/cms:${{ github.sha }}|' prod/cms/deployment.yml
+          git config user.name "GitHub Actions Bot"
+          git config user.email "[email protected]"
+          git add prod/cms/deployment.yml
+          git commit -m "Update cms image to ${{ github.sha }}"
+          git push https://${PAT}@github.com/code100x/staging-ops.git main

.github/workflows/lint.yml

@@ -3,7 +3,7 @@ on:
   pull_request:
     branches:
       - '**'
-    
+
 jobs:
 
   Continuous-Integration:
@@ -14,11 +14,14 @@ jobs:
       - name: Checkout the Repository
         uses: actions/checkout@v3
 
+      - name: Setup pnpm
+        run: npm install -g pnpm
+
       - name: Install Dependencies
-        run: npm install --legacy-peer-deps
+        run: pnpm install
 
       - name: Run linting check
-        run: npm run lint:check
+        run: pnpm run lint:check
 
       - name: Check formatting
-        run: npm run format:check
+        run: pnpm run format:check

.gitignore

@@ -5,6 +5,7 @@
 /.pnp
 .pnp.js
 .yarn/install-state.gz
+bun.lockb
 
 # docker volume
 /postgres-data/
@@ -34,6 +35,10 @@ yarn-error.log*
 # vercel
 .vercel
 
+#vs-code (debug config)
+.vscode
+launch.json
+
 # typescript
 *.tsbuildinfo
 next-env.d.ts

.npmrc

@@ -0,0 +1 @@
+legacy-peer-deps = true

Dockerfile.dev

@@ -2,14 +2,15 @@ FROM node:20-alpine
 
 WORKDIR /usr/src/app
 
-COPY package.json package-lock.json ./
+COPY package.json pnpm-lock.yaml ./
 COPY prisma ./prisma
 
-RUN  npm install
+RUN npm i pnpm -g
+
+RUN pnpm install
 
 COPY . .
 
 EXPOSE 3000
 
-CMD ["npm", "run", "dev:docker"]
-
+CMD ["pnpm", "dev:docker"]

Dockerfile.prod

@@ -1,14 +1,31 @@
-FROM node:20-alpine
-ARG DATABASE_URL
+FROM node:20-alpine AS build
 
 WORKDIR /usr/src/app
+ARG DATABASE_URL
+ENV DATABASE_URL=${DATABASE_URL}
 
 COPY . .
 
-RUN npm install
-RUN DATABASE_URL=$DATABASE_URL npx prisma generate
-RUN DATABASE_URL=$DATABASE_URL npm run build
+RUN npm install -g pnpm && \
+  pnpm install && \
+  pnpm add sharp && \
+  pnpm run build
+
+RUN DATABASE_URL=${DATABASE_URL} pnpm dlx prisma generate
+
+FROM node:20-alpine AS run
+
+RUN mkdir /.npm && chown -R 1001:1001 /.npm
+
+USER 1001:1001
+WORKDIR /usr/src/app
+
+COPY --from=build --chown=1001:1001 usr/src/app/.next/standalone ./
+COPY --from=build --chown=1001:1001 usr/src/app/.next/static ./.next/static
+COPY --from=build --chown=1001:1001 usr/src/app/public ./public
 
-EXPOSE 3000
+ENV NODE_ENV production
+ENV PORT 3000
+ENV HOSTNAME "0.0.0.0"
 
-CMD ["npm", "run", "start"]
+CMD [ "node", "server.js" ]