Merge branch 'dev' into Panther-Paymentpage

.github/workflows/codeql.yml

@@ -0,0 +1,93 @@
+# For most projects, this workflow file will not need changing; you simply need
+# to commit it to your repository.
+#
+# You may wish to alter this file to override the set of languages analyzed,
+# or to provide custom queries or build logic.
+#
+# ******** NOTE ********
+# We have attempted to detect the languages in your repository. Please check
+# the `language` matrix defined below to confirm you have the correct set of
+# supported CodeQL languages.
+#
+name: "CodeQL"
+
+on:
+  push:
+    branches: [ "dev", "devops", "main", "staging" ]
+  pull_request:
+    branches: [ "dev", "devops", "main", "staging" ]
+  schedule:
+    - cron: '35 14 * * 1'
+
+jobs:
+  analyze:
+    name: Analyze (${{ matrix.language }})
+    # Runner size impacts CodeQL analysis time. To learn more, please see:
+    #   - https://gh.io/recommended-hardware-resources-for-running-codeql
+    #   - https://gh.io/supported-runners-and-hardware-resources
+    #   - https://gh.io/using-larger-runners (GitHub.com only)
+    # Consider using larger runners or machines with greater resources for possible analysis time improvements.
+    runs-on: ${{ (matrix.language == 'swift' && 'macos-latest') || 'ubuntu-latest' }}
+    timeout-minutes: ${{ (matrix.language == 'swift' && 120) || 360 }}
+    permissions:
+      # required for all workflows
+      security-events: write
+
+      # required to fetch internal or private CodeQL packs
+      packages: read
+
+      # only required for workflows in private repositories
+      actions: read
+      contents: read
+
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+        - language: javascript-typescript
+          build-mode: none
+        # CodeQL supports the following values keywords for 'language': 'c-cpp', 'csharp', 'go', 'java-kotlin', 'javascript-typescript', 'python', 'ruby', 'swift'
+        # Use `c-cpp` to analyze code written in C, C++ or both
+        # Use 'java-kotlin' to analyze code written in Java, Kotlin or both
+        # Use 'javascript-typescript' to analyze code written in JavaScript, TypeScript or both
+        # To learn more about changing the languages that are analyzed or customizing the build mode for your analysis,
+        # see https://docs.github.com/en/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/customizing-your-advanced-setup-for-code-scanning.
+        # If you are analyzing a compiled language, you can modify the 'build-mode' for that language to customize how
+        # your codebase is analyzed, see https://docs.github.com/en/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/codeql-code-scanning-for-compiled-languages
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v4
+
+    # Initializes the CodeQL tools for scanning.
+    - name: Initialize CodeQL
+      uses: github/codeql-action/init@v3
+      with:
+        languages: ${{ matrix.language }}
+        build-mode: ${{ matrix.build-mode }}
+        # If you wish to specify custom queries, you can do so here or in a config file.
+        # By default, queries listed here will override any specified in a config file.
+        # Prefix the list here with "+" to use these queries and those in the config file.
+
+        # For more details on CodeQL's query packs, refer to: https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
+        # queries: security-extended,security-and-quality
+
+    # If the analyze step fails for one of the languages you are analyzing with
+    # "We were unable to automatically build your code", modify the matrix above
+    # to set the build mode to "manual" for that language. Then modify this step
+    # to build your code.
+    # ℹ️ Command-line programs to run using the OS shell.
+    # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
+    - if: matrix.build-mode == 'manual'
+      shell: bash
+      run: |
+        echo 'If you are using a "manual" build mode for one or more of the' \
+          'languages you are analyzing, replace this with the commands to build' \
+          'your code, for example:'
+        echo '  make bootstrap'
+        echo '  make release'
+        exit 1
+
+    - name: Perform CodeQL Analysis
+      uses: github/codeql-action/analyze@v3
+      with:
+        category: "/language:${{matrix.language}}"

.github/workflows/production-deployment.yml

@@ -1,14 +1,41 @@
 name: Production Deployment
 
 on:
+  workflow_dispatch:
   push:
     branches:
       - main
     paths-ignore:
       - .github/workflows/**
 
 jobs:
+  build_and_push:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Login to Docker Hub
+        uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+
+      - name: Build and push
+        uses: docker/build-push-action@v6
+        with:
+          file: docker/prod/Dockerfile
+          push: true
+          tags: hngdevops/nextjs-boilerplate:prod
+
   deploy_to_production:
+    needs: build_and_push
     if: github.event.repository.fork == false
     runs-on: ubuntu-latest
 
@@ -24,4 +51,5 @@ jobs:
           username: ${{ secrets.USERNAME }}
           password: ${{ secrets.PASSWORD }}
           script: |
-            ./deploy_prod.sh next 
+            cd hng_boilerplate_nextjs
+            ./scripts/prod_deploy.sh  

.github/workflows/staging-deployment.yml

@@ -1,14 +1,41 @@
 name: Staging Deployment
 
 on:
+  workflow_dispatch:
   push:
     branches:
       - staging
     paths-ignore:
       - .github/workflows/**
 
 jobs:
+  build_and_push:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Login to Docker Hub
+        uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+
+      - name: Build and push
+        uses: docker/build-push-action@v6
+        with:
+          file: docker/staging/Dockerfile
+          push: true
+          tags: hngdevops/nextjs-boilerplate:staging
+
   deploy_to_staging:
+    needs: build_and_push
     if: github.event.repository.fork == false
     runs-on: ubuntu-latest
 
@@ -24,4 +51,5 @@ jobs:
           username: ${{ secrets.USERNAME }}
           password: ${{ secrets.PASSWORD }}
           script: |
-            ./deploy_staging.sh next 
+            cd hng_boilerplate_nextjs
+            ./scripts/staging_deploy.sh  

.github/workflows/team-deployment.yml

@@ -25,6 +25,25 @@ jobs:
           script: |
             cd hng_boilerplate_nextjs
             ./scripts/team_deploy.sh kimiko-golang ${{ vars.PORT }}
+            
+  kimiko-csharp:
+    if: github.event.repository.fork == false
+    runs-on: ubuntu-latest
+
+    environment:
+      name: "kimiko-csharp"
+      url: ${{ vars.URL }}
+
+    steps:
+      - name: Deploy to kimiko-csharp environment
+        uses: appleboy/ssh-action@v1.0.3
+        with:
+          host: ${{ secrets.HOST }}
+          username: ${{ secrets.USERNAME }}
+          password: ${{ secrets.PASSWORD }}
+          script: |
+            cd hng_boilerplate_nextjs
+            ./scripts/team_deploy.sh kimiko-csharp ${{ vars.PORT }}
 
   cyborgs-java:
     if: github.event.repository.fork == false

docker/prod/Dockerfile

@@ -1,4 +1,4 @@
-Use the official Node.js image based on Alpine Linux for a smaller image size
+# Use the official Node.js image based on Alpine Linux for a smaller image size
 FROM node:20-alpine AS base
 
 FROM base AS deps
@@ -24,6 +24,7 @@ COPY . .
 # Build the application
 RUN corepack enable pnpm && pnpm run build
 
+
 # Production image, copy all the files and run next
 FROM base AS runner
 WORKDIR /app
@@ -52,4 +53,4 @@ ENV PORT 3000
 
 # server.js is created by next build from the standalone output
 # https://nextjs.org/docs/pages/api-reference/next-config-js/output
-CMD HOSTNAME="0.0.0.0" node server.js
+CMD HOSTNAME="0.0.0.0" node server.js

docker/prod/docker-compose.yml

@@ -1,12 +1,11 @@
 services:
 
-  next-prod-frontend-1:
-    build:
-      context: ../../
-      dockerfile: docker/prod/Dockerfile
+  frontend:
+    image: hngdevops/nextjs-boilerplate:prod
     ports:
       - 3000:3000
-    restart: always
+    volumes:
+      - ../../.env:/app/.env
 
   # next-prod-frontend-2:
   #   build:

docker/staging/Dockerfile

@@ -1,4 +1,4 @@
-Use the official Node.js image based on Alpine Linux for a smaller image size
+# Use the official Node.js image based on Alpine Linux for a smaller image size
 FROM node:20-alpine AS base
 
 FROM base AS deps
@@ -24,6 +24,7 @@ COPY . .
 # Build the application
 RUN corepack enable pnpm && pnpm run build
 
+
 # Production image, copy all the files and run next
 FROM base AS runner
 WORKDIR /app
@@ -52,4 +53,4 @@ ENV PORT 3000
 
 # server.js is created by next build from the standalone output
 # https://nextjs.org/docs/pages/api-reference/next-config-js/output
-CMD HOSTNAME="0.0.0.0" node server.js
+CMD HOSTNAME="0.0.0.0" node server.js

docker/staging/docker-compose.yml

@@ -1,12 +1,11 @@
 services:
 
-  next-staging-frontend-1:
-    build:
-      context: ../../
-      dockerfile: docker/staging/Dockerfile
+  frontend:
+    image: hngdevops/nextjs-boilerplate:staging
     ports:
       - 3200:3000
-    restart: always
+    volumes:
+      - ../../.env:/app/.env
 
   # next-staging-frontend-2:
   #   build:

scripts/prod_deploy.sh

@@ -1,22 +1,8 @@
 #!/bin/bash
 
-if [ "$#" -ne 1 ]; then
-  echo "Usage: $0 {next|remix}"
-  exit 1
-fi
+set -e
 
-if [ "$1" == "next" ]; then
-  cd /home/nextjs/prod/hng_boilerplate_nextjs
-  git pull origin main
-  docker compose -f docker/prod/docker-compose.yml build
-  docker compose -f docker/prod/docker-compose.yml up -d
-elif [ "$1" == "remix" ]; then
-  cd /home/remixjs/prod/hng_boilerplate_remix
-  git pull origin main
-  docker compose -f docker/prod/docker-compose.yml build
-  docker compose -f docker/prod/docker-compose.yml up -d
-else
-  echo "Invalid argument. Use 'next' or 'remix'."
-  echo "Usage: $0 {next|remix}"
-  exit 1
-fi
+cd "$(git rev-parse --show-toplevel)"
+git pull origin main
+docker pull hngdevops/nextjs-boilerplate:prod
+docker compose --project-name prod-nextjs -f docker/prod/docker-compose.yml up -d

scripts/staging_deploy.sh

@@ -1,22 +1,8 @@
 #!/bin/bash
 
-if [ "$#" -ne 1 ]; then
-  echo "Usage: $0 {next|remix}"
-  exit 1
-fi
+set -e
 
-if [ "$1" == "next" ]; then
-  cd /home/nextjs/staging/hng_boilerplate_nextjs
-  git pull origin staging
-  docker compose -f docker/staging/docker-compose.yml build
-  docker compose -f docker/staging/docker-compose.yml up -d
-elif [ "$1" == "remix" ]; then
-  cd /home/remixjs/staging/hng_boilerplate_remix
-  git pull origin staging
-  docker compose -f docker/staging/docker-compose.yml build
-  docker compose -f docker/staging/docker-compose.yml up -d
-else
-  echo "Invalid argument. Use 'next' or 'remix'."
-  echo "Usage: $0 {next|remix}"
-  exit 1
-fi
+cd "$(git rev-parse --show-toplevel)"
+git pull origin staging
+docker pull hngdevops/nextjs-boilerplate:staging
+docker compose --project-name staging-nextjs -f docker/staging/docker-compose.yml up -d