Minor fixes (#61)

piyushroshan · mathew-jose · nikhil-rajesh · web-flow · commit 35890caae0f0 · 2022-05-26T17:44:44.000+05:30
* Removed reference to Traceable from Service - Web * Removed reference to Traceable from Service - Workshop * build-docker-images build-docker-images on pull request * Removed Author meta tag * CI workflow setup * Fix tags syntax * Convert env to job.build.env * Convert job context to needs job output * Fix workflow push condition * Push condition workflow fix * Removed mentions of Traceable from the source code (#22) * Removed all Traceable mentions in crapi-community service * Removed all Traceable mentions in crapi-identity service * Removed all Traceable mentions in deploy configs and Removed Copyright file * Removed all Traceable mentions in README and LICENSE * Removed all Traceable mentions in k8 deploy configs * Correct indentation fixing workflow issues (#34) * Modified docker configs to support ARM builds (#20) * Added scripts to built mailhog * Moved from docker-compose-wait to pure docker-compose alternative * Removed GOOS and GOARCH env variables * Modified bash build script to only run bash files recursively Co-authored-by: Roshan Piyush <roshan.piyush@traceable.ai> * Batch Files To Deploy Docker on Windows Machine (#19) * Added batch files for all services * Added the batch file to build all docker images * Removed comments from build batch files * Updated README * Modified README * Removed Print Statements Co-authored-by: Roshan Piyush <roshan.piyush@traceable.ai> * Docker compose support variables for different release (#37) * Docker compose support variables for different release * Update build wrappers * Change pull_request docker login condition (#40) * Retrieval Of Orders Bug (#38) Retrieval Of Orders Bug (#38) * Added Heap memory limit for crapi-identity java application (#36) Co-authored-by: Roshan Piyush <roshan.piyush@traceable.ai> * Update readme (#43) * Update CI branch refs (#44) * Workflow merge fix (#45) * vagrant: upgrade to ubuntu jammy (#42) vagrant: upgrade to ubuntu jammy (#42) * chore: adds contributing guidelines, code of conduct, PR and issue templates (#46) Co-authored-by: Jayesh Bapu Ahire <jayeshbahire@gmail.coml> * Modify Templates: Pull Request and Issues (#48) * Update templates * Modify guidelines * Fix workflow path * Max File Size Limit for Video Files (#47) * Added Video Size Limit * Load built images in docker (#51) * Seperate build, run and push * Run Postman Collection Once All Docker Images are built (#50) * Added Postman collection and env variables * Update ci.yml to run postman collections Co-authored-by: Roshan Piyush <roshan.piyush@traceable.ai> * Dynamic Ports for Identity, Community and Workshop services (#49) * Added dynamic port settings for Identity service * Added dynamic port settings for Community service * Added dynamic port settings for Workshop service * Added default port numbers for the services * Version Variable for Windows (#53) * Set version env variable for docker-compose * Increased memory limit for crapi-identity container (#57) * Openapi Spec Added (#58) Co-authored-by: mathew-jose <mathewjose2409@gmail.com> * Update Vagrant to use prebuilt images and fix db versions (#59) * Update Vagrant to use prebuilt images * Fix mongo and postgres version * Update latest on main merge (#60) Update latest tag on main merge * Release created -> published (#62) Release created -> published Co-authored-by: mathew-jose <mathewjose2409@gmail.com> Co-authored-by: Nikhil R <mail@nikhilrajesh.com> Co-authored-by: Mathew Jose Mammoottil <60283272+mathew-jose@users.noreply.github.com> Co-authored-by: Nikhil R <nikhilr.v2.0@gmail.com> Co-authored-by: PauloASilva <pauloasilva@gmail.com> Co-authored-by: Jayesh Bapu Ahire <jayeshbahire@gmail.com> Co-authored-by: Jayesh Bapu Ahire <jayeshbahire@gmail.coml> Co-authored-by: willmccardell <33265548+willmccardell@users.noreply.github.com>
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -18,7 +18,7 @@ jobs:
   build-context:
     runs-on: ubuntu-latest
     outputs:
-      push_image: ${{ (github.event_name == 'push' && (github.ref == 'refs/heads/main' || github.ref == 'refs/heads/develop')) || (github.event_name == 'release' && github.event.action == 'created') }}
+      push_image: ${{ (github.event_name == 'push' && (github.ref == 'refs/heads/main' || github.ref == 'refs/heads/develop')) || (github.event_name == 'release' && github.event.action == 'published') }}
     steps:
       - name: Dump GitHub context
         env:
@@ -32,55 +32,60 @@ jobs:
     steps:
       - name: Checkout code
         uses: actions/checkout@v3
- 
+
       - name: Env seen prerun
         run: env
-      
+
       - name: Get branch name
         id: branch-name
         uses: tj-actions/branch-names@v5.2
-      
+
       - name: Current branch name
         run: |
           echo "Current Branch: ${{ steps.branch-name.outputs.current_branch }}"
           echo "Target Branch: ${{ steps.branch-name.outputs.base_ref_branch }}"
           echo "Tag if exist: ${{ steps.branch-name.outputs.tag }}"
-  
+
       - name: Running on a tag.
         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}
-    
+
       - name: Running on a branch and merge.
-        if: steps.branch-name.outputs.is_tag != 'true' && github.event_name == 'push' 
+        if: steps.branch-name.outputs.is_tag != 'true' && github.event_name == 'push' && steps.branch-name.outputs.current_branch != 'main'
         run: |
           echo "TAG_NAME=${{ steps.branch-name.outputs.current_branch }}" >> ${GITHUB_ENV}
           echo "TAG_LATEST=${{ steps.branch-name.outputs.current_branch }}" >> ${GITHUB_ENV}
 
+      - name: Running on main branch.
+        if: steps.branch-name.outputs.is_tag != 'true' && github.event_name == 'push' && steps.branch-name.outputs.current_branch == 'main'
+        run: |
+          echo "TAG_NAME=${{ steps.branch-name.outputs.current_branch }}" >> ${GITHUB_ENV}
+          echo "TAG_LATEST=latest" >> ${GITHUB_ENV}
+
       - name: Running on a branch and pull req.
-        if: steps.branch-name.outputs.is_tag != 'true' && github.event_name != 'push' 
+        if: steps.branch-name.outputs.is_tag != 'true' && github.event_name != 'push'
         run: |
           echo "TAG_NAME=${{ steps.branch-name.outputs.base_ref_branch }}" >> ${GITHUB_ENV}
           echo "TAG_LATEST=${{ steps.branch-name.outputs.base_ref_branch }}" >> ${GITHUB_ENV}
- 
-      
+
       # setup Docker build action
       - name: Set up Docker Buildx
         id: buildx
         uses: docker/setup-buildx-action@v1
       - name: Set up QEMU
         id: qemu
         uses: docker/setup-qemu-action@v1
-      
+
       - name: Login to DockerHub
         if: needs.build-context.outputs.push_image == 'true'
         uses: docker/login-action@v1
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
-      
-      - name: Build crapi-identity image 
+
+      - name: Build crapi-identity image
         uses: docker/build-push-action@v2
         with:
           context: ./services/identity
@@ -90,8 +95,8 @@ jobs:
           platforms: linux/amd64
           cache-from: type=gha
           cache-to: type=gha,mode=max
-      
-      - name: Build crapi-workshop image 
+
+      - name: Build crapi-workshop image
         uses: docker/build-push-action@v2
         with:
           context: ./services/workshop
@@ -101,8 +106,8 @@ jobs:
           platforms: linux/amd64
           cache-from: type=gha
           cache-to: type=gha,mode=max
-          
-      - name: Build crapi-community image 
+
+      - name: Build crapi-community image
         uses: docker/build-push-action@v2
         with:
           context: ./services/community
@@ -112,8 +117,8 @@ jobs:
           platforms: linux/amd64
           cache-from: type=gha
           cache-to: type=gha,mode=max
-          
-      - name: Build crapi-web image 
+
+      - name: Build crapi-web image
         uses: docker/build-push-action@v2
         with:
           context: ./services/web
@@ -129,8 +134,8 @@ jobs:
         uses: andstor/file-existence-action@v1
         with:
           files: "./services/mailhog"
-          
-      - name: Build mailhog image 
+
+      - name: Build mailhog image
         if: steps.check_mailhog_exists.outputs.files_exists == 'true'
         uses: docker/build-push-action@v2
         with:
@@ -141,13 +146,13 @@ jobs:
           platforms: linux/amd64
           cache-from: type=gha
           cache-to: type=gha,mode=max
-        
+
       - name: Show all images built
         run: docker images
-  
+
       - name: Env seen
         run: env
-        
+
       - name: Run crAPI using built images
         run: VERSION=${{ env.TAG_NAME }} docker-compose -f deploy/docker/docker-compose.yml --compatibility up -d
 
@@ -171,7 +176,7 @@ jobs:
           platforms: ${{ env.PLATFORMS }}
           cache-from: type=gha
           cache-to: type=gha,mode=max
-      
+
       - name: Build crapi-workshop all platforms and conditionally push to Docker Hub
         uses: docker/build-push-action@v2
         with:
@@ -181,7 +186,7 @@ jobs:
           platforms: ${{ env.PLATFORMS }}
           cache-from: type=gha
           cache-to: type=gha,mode=max
-          
+
       - name: Build crapi-community all platforms and conditionally push to Docker Hub
         uses: docker/build-push-action@v2
         with:
@@ -191,7 +196,7 @@ jobs:
           platforms: ${{ env.PLATFORMS }}
           cache-from: type=gha
           cache-to: type=gha,mode=max
-          
+
       - name: Build crapi-web all platforms and conditionally push to Docker Hub
         uses: docker/build-push-action@v2
         with:
@@ -212,4 +217,4 @@ jobs:
           platforms: ${{ env.PLATFORMS }}
           cache-from: type=gha
           cache-to: type=gha,mode=max
-        
+
diff --git a/README.md b/README.md
@@ -34,17 +34,41 @@ You can use prebuilt images generated by our CI workflow.
 
 2. Start crAPI
     - To use the latest stable version.
-    ```
-    git checkout main
-    
-    VERSION=latest docker-compose -f deploy/docker/docker-compose.yml --compatibility up -d
-    ```
+
+      - Linux Machine
+      
+      ```
+      git checkout main
+      
+      VERSION=latest docker-compose -f deploy/docker/docker-compose.yml --compatibility up -d
+      ```
+
+      - Windows Machine
+      
+      ```
+      git checkout main
+      
+      setx VERSION latest && docker-compose -f deploy/docker/docker-compose.yml --compatibility up -d
+      ```
+
     - To use the latest development version
-    ```
-    git checkout develop
-    
-    VERSION=develop docker-compose -f deploy/docker/docker-compose.yml --compatibility up -d
-    ```
+
+      - Linux Machine
+      
+      ```
+      git checkout develop
+      
+      VERSION=develop docker-compose -f deploy/docker/docker-compose.yml --compatibility up -d
+      ```
+
+      - Windows Machine
+      
+      ```
+      git checkout develop
+      
+      setx VERSION develop && docker-compose -f deploy/docker/docker-compose.yml --compatibility up -d
+      ```
+
 3. Visit `http://localhost:8888`
 
 **Note**: All emails are sent to mailhog service by default and can be checked on
diff --git a/deploy/docker/docker-compose.yml b/deploy/docker/docker-compose.yml
@@ -51,7 +51,7 @@ services:
       resources:
         limits:
           cpus: '0.8'
-          memory: 256M
+          memory: 384M
 
   crapi-community:
     container_name: crapi-community
@@ -157,7 +157,7 @@ services:
 
   postgresdb:
     container_name: postgresdb
-    image: 'postgres'
+    image: 'postgres:14'
     environment:
       POSTGRES_USER: admin
       POSTGRES_PASSWORD: crapisecretpassword
@@ -176,10 +176,10 @@ services:
         limits:
           cpus: '0.3'
           memory: 128M
-  
+
   mongodb:
     container_name: mongodb
-    image: 'mongo'
+    image: 'mongo:4.4'
     environment:
       MONGO_INITDB_ROOT_USERNAME: admin
       MONGO_INITDB_ROOT_PASSWORD: crapisecretpassword
@@ -206,7 +206,7 @@ services:
     environment:
       MH_MONGO_URI: admin:crapisecretpassword@mongodb:27017
       MH_STORAGE: mongodb
-    ports: 
+    ports:
     #  - "127.0.0.1:1025:1025" # smtp server
       - "127.0.0.1:8025:8025" # Mail ui
     healthcheck:
diff --git a/deploy/vagrant/provisioner.sh b/deploy/vagrant/provisioner.sh
@@ -33,10 +33,10 @@ curl -sL https://github.com/docker/compose/releases/download/v2.5.0/docker-compo
 chmod +x /usr/local/bin/docker-compose
 ln -s /usr/local/bin/docker-compose /usr/bin/docker-compose
 
-# Build crAPI
-"$MOUNT_DIR/deploy/docker/build-all.sh"
+# Build crAPI 
+# "$MOUNT_DIR/deploy/docker/build-all.sh"
 
-# Install crAPI
+# Install crAPI using prebuilt images
 mkdir /opt/crapi
 
 cp "$MOUNT_DIR/deploy/docker/docker-compose.yml" /opt/crapi \
diff --git a/openapi-spec/openapi-spec.json b/openapi-spec/openapi-spec.json
