Chatbot impl

.github/workflows/pr-build.yml

@@ -35,6 +35,8 @@ jobs:
       - name: Get branch name
         id: branch-name
         uses: tj-actions/branch-names@v8
+        with:
+          strip_tag_prefix: 'v'
 
       - name: Current branch name
         run: |
@@ -46,7 +48,7 @@ jobs:
         if: steps.branch-name.outputs.is_tag == 'true'
         run: |
           echo "TAG_NAME=${{ steps.branch-name.outputs.tag }}" >> ${GITHUB_ENV}
-          echo "TAG_LATEST=latest" >> ${GITHUB_ENV}
+          echo "TAG_LATEST=${{ steps.branch-name.outputs.tag }}" >> ${GITHUB_ENV}
 
       - name: Running on a branch and merge.
         if: steps.branch-name.outputs.is_tag != 'true' && github.event_name == 'push' && steps.branch-name.outputs.current_branch != 'main'
@@ -96,6 +98,17 @@ jobs:
           cache-from: type=gha,scope=workshop-service
           cache-to: type=gha,mode=max,scope=workshop-service
 
+      - name: Build crapi-chatbot image
+        uses: docker/build-push-action@v3
+        with:
+            context: ./services/chatbot
+            tags: crapi/crapi-chatbot:${{ env.TAG_LATEST }},crapi/crapi-chatbot:${{ env.TAG_NAME }}
+            push: false
+            load: true
+            platforms: linux/amd64
+            cache-from: type=gha,scope==chatbot-service
+            cache-to: type=gha,mode=max,scope=chatbot-service
+
       - name: Build crapi-community image
         uses: docker/build-push-action@v3
         with:

.github/workflows/publish.yml

@@ -37,6 +37,8 @@ jobs:
       - name: Get branch name
         id: branch-name
         uses: tj-actions/branch-names@v8
+        with:
+          strip_tag_prefix: 'v'
 
       - name: Current branch name
         run: |
@@ -48,7 +50,7 @@ jobs:
         if: steps.branch-name.outputs.is_tag == 'true'
         run: |
           echo "TAG_NAME=${{ steps.branch-name.outputs.tag }}" >> ${GITHUB_ENV}
-          echo "TAG_LATEST=latest" >> ${GITHUB_ENV}
+          echo "TAG_LATEST=${{ steps.branch-name.outputs.tag }}" >> ${GITHUB_ENV}
 
       - name: Running on a branch and merge.
         if: steps.branch-name.outputs.is_tag != 'true' && github.event_name == 'push' && steps.branch-name.outputs.current_branch != 'main'
@@ -102,6 +104,16 @@ jobs:
           cache-from: type=gha,scope=workshop-service
           cache-to: type=gha,mode=max,scope=workshop-service
 
+      - name: Build crapi-chatbot all platforms and push to Docker Hub
+        uses: docker/build-push-action@v3
+        with:
+            context: ./services/chatbot
+            tags: crapi/crapi-chatbot:${{ env.TAG_LATEST }},crapi/crapi-chatbot:${{ env.TAG_NAME }}
+            platforms: ${{ env.PLATFORMS }}
+            push: true
+            cache-from: type=gha,scope=chatbot-service
+            cache-to: type=gha,mode=max,scope=chatbot-service
+
       - name: Build crapi-community all platforms and push to Docker Hub
         uses: docker/build-push-action@v3
         with:

.github/workflows/workflow-multiarch.yml

@@ -0,0 +1,225 @@
+name: Release Publish
+on: workflow_dispatch
+
+jobs:
+  build-context:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Dump GitHub context
+        env:
+          GITHUB_CONTEXT: ${{ toJson(github) }}
+        run: echo "$GITHUB_CONTEXT"
+  build:
+    needs: build-context
+    strategy:
+      matrix:
+        include:
+          - runner: ubuntu-latest
+            platform: linux/amd64
+            arch_alias: 'amd64'
+          - runner: ubuntu-latest-arm64
+            platform: linux/arm64
+            arch_alias: 'arm64'
+    runs-on: ${{ matrix.runner }}
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Env seen prerun
+        run: env
+
+      - name: Get branch metadata
+        id: branch-name
+        uses: tj-actions/branch-names@v8
+
+      - name: Current tag name
+        run: |
+          echo "Tag if exist: ${{ steps.branch-name.outputs.tag }}"
+
+      - name: If not a tag, terminate the workflow
+        if: steps.branch-name.outputs.is_tag != 'true'
+        run: exit 1
+
+      - name: Running on a tag.
+        run: |
+          echo "TAG_NAME=${{ steps.branch-name.outputs.tag }}" >> ${GITHUB_ENV}
+          echo "TAG_NAME=${{ steps.branch-name.outputs.tag }}" > tag_name.txt
+
+      # Archive the tag name
+      - name: Archive tag name
+        uses: actions/upload-artifact@v2
+        with:
+          name: tag_name
+          path: tag_name.txt
+
+      # setup Docker build action
+      - name: Set up Docker Buildx
+        id: buildx
+        uses: docker/setup-buildx-action@v3
+      - name: Set up QEMU
+        id: qemu
+        uses: docker/setup-qemu-action@v3
+
+      - name: Login to DockerHub
+        uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+
+      - name: Build crapi-identity all platforms and push to Docker Hub
+        uses: docker/build-push-action@v3
+        with:
+          context: ./services/identity
+          tags: crapi/crapi-identity:${{ env.TAG_NAME }}-${{ matrix.arch_alias }}
+          platforms: ${{ matrix.platform }}
+          push: true
+          cache-from: type=gha,scope=identity-service
+          cache-to: type=gha,mode=max,scope=identity-service
+
+      - name: Build crapi-workshop all platforms and push to Docker Hub
+        uses: docker/build-push-action@v3
+        with:
+          context: ./services/workshop
+          tags: crapi/crapi-workshop:${{ env.TAG_NAME }}-${{ matrix.arch_alias }}
+          platforms: ${{ matrix.platform }}
+          push: true
+          cache-from: type=gha,scope=workshop-service
+          cache-to: type=gha,mode=max,scope=workshop-service
+
+      - name: Build crapi-chatbot all platforms and push to Docker Hub
+        uses: docker/build-push-action@v3
+        with:
+            context: ./services/chatbot
+            tags: crapi/crapi-chatbot:${{ env.TAG_NAME }}-${{ matrix.arch_alias }}
+            platforms: ${{ matrix.platform }}
+            push: true
+            cache-from: type=gha,scope=chatbot-service
+            cache-to: type=gha,mode=max,scope=chatbot-service
+
+      - name: Build crapi-community all platforms and push to Docker Hub
+        uses: docker/build-push-action@v3
+        with:
+          context: ./services/community
+          tags: crapi/crapi-community:${{ env.TAG_NAME }}-${{ matrix.arch_alias }}
+          platforms: ${{ matrix.platform }}
+          push: true
+          cache-from: type=gha,scope=community-service
+          cache-to: type=gha,mode=max,scope=community-service
+
+      - name: Build crapi-web all platforms and push to Docker Hub
+        uses: docker/build-push-action@v3
+        with:
+          context: ./services/web
+          tags: crapi/crapi-web:${{ env.TAG_NAME }}-${{ matrix.arch_alias }}
+          platforms: ${{ matrix.platform }}
+          push: true
+          cache-from: type=gha,scope=web-service
+          cache-to: type=gha,mode=max,scope=web-service
+
+      - name: Build gateway-service all platforms and push to Docker Hub
+        uses: docker/build-push-action@v3
+        with:
+          context: ./services/gateway-service
+          tags: crapi/gateway-service:${{ env.TAG_NAME }}-${{ matrix.arch_alias }}
+          platforms: ${{ matrix.platform }}
+          push: true
+          cache-from: type=gha,scope=gateway-service
+          cache-to: type=gha,mode=max,scope=gateway-service
+
+      - name: Build mailhog all platforms and push to Docker Hub
+        uses: docker/build-push-action@v3
+        with:
+          context: ./services/mailhog
+          tags: crapi/mailhog:${{ env.TAG_NAME }}-${{ matrix.arch_alias }}
+          platforms: ${{ matrix.platform }}
+          push: true
+          cache-from: type=gha,scope=mailhog-service
+          cache-to: type=gha,mode=max,scope=mailhog-service
+
+  publish-manifests:
+    needs: build
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Download tag name
+        uses: actions/download-artifact@v2
+        with:
+          name: tag_name
+          path: .
+
+      - name: Read tag name
+        id: tag_name
+        run: |
+          echo "TAG_NAME=$(cat tag_name.txt)" >> $GITHUB_ENV
+
+      - name: Create and push manifest images for crapi-identity
+        uses: Noelware/docker-manifest-action@v1
+        with:
+            inputs: |
+              crapi/crapi-identity:${{ env.TAG_NAME }}-amd64
+              crapi/crapi-identity:${{ env.TAG_NAME }}-arm64
+            outputs: |
+              crapi/crapi-identity:${{ env.TAG_NAME }}
+            push: true
+
+      - name: Create and push manifest images for crapi-workshop
+        uses: Noelware/docker-manifest-action@v1
+        with:
+            inputs: |
+              crapi/crapi-workshop:${{ env.TAG_NAME }}-amd64
+              crapi/crapi-workshop:${{ env.TAG_NAME }}-arm64
+            outputs: |
+              crapi/crapi-workshop:${{ env.TAG_NAME }}
+            push: true
+
+      - name: Create and push manifest images for crapi-chatbot
+        uses: Noelware/docker-manifest-action@v1
+        with:
+            inputs: |
+              crapi/crapi-chatbot:${{ env.TAG_NAME }}-amd64
+              crapi/crapi-chatbot:${{ env.TAG_NAME }}-arm64
+            outputs: |
+              crapi/crapi-chatbot:${{ env.TAG_NAME }}
+            push: true
+
+      - name: Create and push manifest images for crapi-community
+        uses: Noelware/docker-manifest-action@v1
+        with:
+            inputs: |
+              crapi/crapi-community:${{ env.TAG_NAME }}-amd64
+              crapi/crapi-community:${{ env.TAG_NAME }}-arm64
+            outputs: |
+              crapi/crapi-community:${{ env.TAG_NAME }}
+            push: true
+
+      - name: Create and push manifest images for crapi-web
+        uses: Noelware/docker-manifest-action@v1
+        with:
+            inputs: |
+              crapi/crapi-web:${{ env.TAG_NAME }}-amd64
+              crapi/crapi-web:${{ env.TAG_NAME }}-arm64
+            outputs: |
+              crapi/crapi-web:${{ env.TAG_NAME }}
+            push: true
+
+      - name: Create and push manifest images for gateway-service
+        uses: Noelware/docker-manifest-action@v1
+        with:
+            inputs: |
+              crapi/gateway-service:${{ env.TAG_NAME }}-amd64
+              crapi/gateway-service:${{ env.TAG_NAME }}-arm64
+            outputs: |
+              crapi/gateway-service:${{ env.TAG_NAME }}
+            push: true
+
+      - name: Create and push manifest images for mailhog
+        uses: Noelware/docker-manifest-action@v1
+        with:
+            inputs: |
+              crapi/mailhog:${{ env.TAG_NAME }}-amd64
+              crapi/mailhog:${{ env.TAG_NAME }}-arm64
+            outputs: |
+              crapi/mailhog:${{ env.TAG_NAME }}
+            push: true

.gitignore

@@ -3,3 +3,4 @@ deploy/vagrant/.vagrant
 .secrets
 .vscode/
 *.local
+services/chatbot/db

README.md

@@ -163,3 +163,5 @@ To know more about challenges in crAPI. Visit [challenges]
 
 ## Troubleshooting guide for general issues while installing and running crAPI
 If you need any help with installing and running crAPI you can check out this guide: [Troubleshooting guide crAPI](https://github.com/OWASP/crAPI/blob/main/docs/troubleshooting.md). If this doesn't solve your problem, please create an issue in Github Issues.
+
+

deploy/docker/.env

@@ -1,6 +1,7 @@
 IDENTITY_SERVER_PORT=8080
 COMMUNITY_SERVER_PORT=8087
 WORKSHOP_SERVER_PORT=8000
+CHATBOT_SERVER_PORT=5002
 ENABLE_SHELL_INJECTION=false
 ENABLE_LOG4J=false
 LISTEN_IP="127.0.0.1"

deploy/docker/docker-compose.yml

@@ -150,6 +150,29 @@ services:
           cpus: '0.3'
           memory: 128M
 
+  crapi-chatbot:
+    container_name: crapi-chatbot
+    image: crapi/crapi-chatbot:${VERSION:-latest}
+    environment:
+      - TLS_ENABLED=${TLS_ENABLED:-false}
+      - SERVER_PORT=${CHATBOT_SERVER_PORT:-5002}
+      - DB_NAME=crapi
+      - DB_USER=admin
+      - DB_PASSWORD=crapisecretpassword
+      - DB_HOST=postgresdb
+      - DB_PORT=5432
+      - MONGO_DB_HOST=mongodb
+      - MONGO_DB_PORT=27017
+      - MONGO_DB_USER=admin
+      - MONGO_DB_PASSWORD=crapisecretpassword
+      - MONGO_DB_NAME=crapi
+      # - CHATBOT_OPENAI_API_KEY=
+    depends_on:
+      mongodb:
+        condition: service_healthy
+    # ports:
+    #  - "${LISTEN_IP:-127.0.0.1}:5002:5002"
+
   crapi-web:
     container_name: crapi-web
     image: crapi/crapi-web:${VERSION:-latest}
@@ -162,6 +185,7 @@ services:
       - COMMUNITY_SERVICE=crapi-community:${COMMUNITY_SERVER_PORT:-8087}
       - IDENTITY_SERVICE=crapi-identity:${IDENTITY_SERVER_PORT:-8080}
       - WORKSHOP_SERVICE=crapi-workshop:${WORKSHOP_SERVER_PORT:-8000}
+      - CHATBOT_SERVICE=crapi-chatbot:${CHATBOT_SERVER_PORT:-5002}
       - MAILHOG_WEB_SERVICE=mailhog:8025
       - TLS_ENABLED=${TLS_ENABLED:-false}
     depends_on:

deploy/docker/scripts/load.sh

@@ -3,6 +3,7 @@ docker load -i gateway-service.tar
 docker load -i crapi-identity.tar
 docker load -i crapi-community.tar
 docker load -i crapi-workshop.tar
+docker load -i crapi-chatbot.tar
 docker load -i crapi-web.tar
 docker load -i postgres.tar
 docker load -i mongo.tar

deploy/docker/scripts/save.sh

@@ -3,6 +3,7 @@ docker save crapi/gateway-service:develop -o gateway-service.tar
 docker save crapi/crapi-identity:develop -o crapi-identity.tar
 docker save crapi/crapi-community:develop -o crapi-community.tar
 docker save crapi/crapi-workshop:develop -o crapi-workshop.tar
+docker save crapi/crapi-chatbot:develop -o crapi-chatbot.tar
 docker save crapi/crapi-web:develop -o crapi-web.tar
 docker save postgres:14 -o postgres.tar
 docker save mongo:4.4 -o mongo.tar

deploy/helm/Chart.yaml

@@ -15,9 +15,9 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.1.4
+version: 0.1.5
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
-appVersion: develop
+appVersion: chatbot