From efa207d588dea968e214f27bbabf8f0a350db756 Mon Sep 17 00:00:00 2001
From: Mahesh <maheshkasbe010@gmail.com>
Date: Sat, 3 Jun 2023 21:39:13 +0530
Subject: [PATCH 01/20] Fixed bootstrap table not showing and other minor bugs

Signed-off-by: Mahesh <maheshkasbe010@gmail.com>
---
 bower.json       | 2 --
 install.sh       | 2 ++
 requirements.txt | 3 ++-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/bower.json b/bower.json
index 7b986c01..d2134384 100644
--- a/bower.json
+++ b/bower.json
@@ -23,11 +23,9 @@
     "animate.css": "^3.5.2",
     "cytoscape": "^2.7.11",
     "webcola": "^3.3.0",
-    "bootstrap": "^3.3.7",
     "cytoscape-cola": "^1.6.0",
     "intro.js": "^2.4.0",
     "jquery-ui": "^1.12.1",
-    "bootstrap-table": "^1.11.0",
     "cytoscape-panzoom": "^2.4.0",
     "select2": "select2-dist#^4.0.3",
     "cytoscape-context-menus": "^2.1.1",
diff --git a/install.sh b/install.sh
index c6a19f4b..50b4ac2f 100644
--- a/install.sh
+++ b/install.sh
@@ -3,3 +3,5 @@
 python setup.py install
 python manage.py migrate --settings=graphspace.settings.local
 bower install
+bower install bootstrap#3.3.7
+bower install bootstrap-table#1.11.0
\ No newline at end of file
diff --git a/requirements.txt b/requirements.txt
index 36f14a9e..ba92c9ad 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -13,7 +13,7 @@ MarkupSafe==0.23
 networkx==1.11
 oauthlib==1.1.2
 poster==0.8.1
-psycopg2==2.6.2
+psycopg2==2.7.4
 py-bcrypt==0.4
 Pygments==2.5.2
 pytz==2016.4
@@ -29,3 +29,4 @@ sphinx-rtd-theme
 sphinx
 recommonmark
 python-dotenv==0.15.0
+lxml

From e258f1e97e910740c8f095bcaa59d2418afff5f5 Mon Sep 17 00:00:00 2001
From: Mahesh <maheshkasbe010@gmail.com>
Date: Thu, 8 Jun 2023 21:43:34 +0530
Subject: [PATCH 02/20] Added Local dockerfile & docker-compose support

Signed-off-by: Mahesh <maheshkasbe010@gmail.com>
---
 Dockerfile          | 10 ++++++++++
 db.sh               |  7 +++++++
 docker-compose.yaml | 30 ++++++++++++++++++++++++++++++
 requirements.txt    |  1 +
 4 files changed, 48 insertions(+)
 create mode 100644 Dockerfile
 create mode 100644 db.sh
 create mode 100644 docker-compose.yaml

diff --git a/Dockerfile b/Dockerfile
new file mode 100644
index 00000000..1c4ab8df
--- /dev/null
+++ b/Dockerfile
@@ -0,0 +1,10 @@
+FROM ubuntu:18.04 AS prod
+WORKDIR /app
+RUN apt-get -y update && apt-get install -y npm && apt-get install -y git
+RUN npm install bower -g
+RUN apt-get install -y python-pip && pip install --upgrade pip
+COPY . /app
+RUN pip install -r requirements.txt
+RUN sh install.sh
+EXPOSE 8000
+CMD python manage.py migrate --settings=graphspace.settings.local && python manage.py runserver 0.0.0.0:8000 --settings=graphspace.settings.local
\ No newline at end of file
diff --git a/db.sh b/db.sh
new file mode 100644
index 00000000..b76d1b9b
--- /dev/null
+++ b/db.sh
@@ -0,0 +1,7 @@
+#!/usr/bin/env bash
+echo "enabling pg_trgm & btree_gin on database $POSTGRES_DB"
+psql -U $POSTGRES_USER --dbname="$POSTGRES_DB" <<-'EOSQL'
+create extension if not exists pg_trgm;
+create extension if not exists btree_gin;
+EOSQL
+echo "finished with exit code $?"
\ No newline at end of file
diff --git a/docker-compose.yaml b/docker-compose.yaml
new file mode 100644
index 00000000..10510fcb
--- /dev/null
+++ b/docker-compose.yaml
@@ -0,0 +1,30 @@
+version: "3.4"
+services:
+  db:
+    image: postgres
+    restart: always
+    environment:
+      POSTGRES_DB: graphspace
+      POSTGRES_USER: postgres
+      POSTGRES_PASSWORD: postgres
+    ports:
+      - "5432:5432"
+    volumes:
+      - pgdata:/var/lib/PostgreSQL/data
+      - ./db.sh:/docker-entrypoint-initdb.d/create_extensions.sh
+
+  graphspace:
+    restart: always
+    stdin_open: true # docker run -i
+    tty: true # docker run -t
+    build:
+      context: .
+    ports:
+      - "8000:8000"
+    volumes:
+      - .:/app
+    depends_on:
+      - db
+
+volumes:
+  pgdata:
\ No newline at end of file
diff --git a/requirements.txt b/requirements.txt
index ba92c9ad..8c03026e 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -30,3 +30,4 @@ sphinx
 recommonmark
 python-dotenv==0.15.0
 lxml
+psycopg2-binary
\ No newline at end of file

From 0b93870bb7eb66119eea9466a78793bc0236d00d Mon Sep 17 00:00:00 2001
From: Mahesh <maheshkasbe010@gmail.com>
Date: Sun, 11 Jun 2023 21:11:02 +0530
Subject: [PATCH 03/20] Added enviornment variables inside docker-compose setup
 and development setup

---
 Dockerfile                   |  3 +--
 docker-compose.prod.yaml     | 14 ++++++++++++++
 docker-compose.yaml          |  8 ++++++++
 graphspace/settings/local.py |  8 ++++----
 4 files changed, 27 insertions(+), 6 deletions(-)
 create mode 100644 docker-compose.prod.yaml

diff --git a/Dockerfile b/Dockerfile
index 1c4ab8df..023addab 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -6,5 +6,4 @@ RUN apt-get install -y python-pip && pip install --upgrade pip
 COPY . /app
 RUN pip install -r requirements.txt
 RUN sh install.sh
-EXPOSE 8000
-CMD python manage.py migrate --settings=graphspace.settings.local && python manage.py runserver 0.0.0.0:8000 --settings=graphspace.settings.local
\ No newline at end of file
+EXPOSE 8000
\ No newline at end of file
diff --git a/docker-compose.prod.yaml b/docker-compose.prod.yaml
new file mode 100644
index 00000000..df319ac5
--- /dev/null
+++ b/docker-compose.prod.yaml
@@ -0,0 +1,14 @@
+version: "3.4"
+services:
+  graphspace:
+    restart: always
+    stdin_open: true # docker run -i
+    tty: true # docker run -t
+    build:
+      context: .
+    ports:
+      - "8000:8000"
+    volumes:
+      - .:/app
+    command: >
+      sh -c "python manage.py migrate && python manage.py runserver"
\ No newline at end of file
diff --git a/docker-compose.yaml b/docker-compose.yaml
index 10510fcb..854ebdec 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -15,6 +15,11 @@ services:
 
   graphspace:
     restart: always
+    environment:
+      POSTGRES_HOST: db
+      POSTGRES_DB: graphspace
+      POSTGRES_USER: postgres
+      POSTGRES_PASSWORD: postgres
     stdin_open: true # docker run -i
     tty: true # docker run -t
     build:
@@ -23,6 +28,9 @@ services:
       - "8000:8000"
     volumes:
       - .:/app
+    command: >
+      sh -c "python manage.py migrate --settings=graphspace.settings.local && 
+            python manage.py runserver 0.0.0.0:8000 --settings=graphspace.settings.local"
     depends_on:
       - db
 
diff --git a/graphspace/settings/local.py b/graphspace/settings/local.py
index b15da20d..a16e92ce 100644
--- a/graphspace/settings/local.py
+++ b/graphspace/settings/local.py
@@ -40,10 +40,10 @@
 DATABASES = {
     'default': {
         'ENGINE': 'django.db.backends.postgresql_psycopg2',
-        'NAME': 'test_database',
-        'USER': 'adb',
-        'PASSWORD': '',
-        'HOST': 'localhost',
+        'NAME':  os.environ.get('POSTGRES_DB', 'graphspace'),
+        'USER':  os.environ.get('POSTGRES_USER', 'postgres'),
+        'PASSWORD': os.environ.get('POSTGRES_PASSWORD', 'postgres'),
+        'HOST': os.environ.get('POSTGRES_HOST', 'localhost'),
         'PORT': '5432'
     }
 }

From d29202467559c5dac951ef1b52514019ad2919fe Mon Sep 17 00:00:00 2001
From: Mahesh <maheshkasbe010@gmail.com>
Date: Sun, 11 Jun 2023 22:23:11 +0530
Subject: [PATCH 04/20] Added an ECR Build & Deploy workflow

Signed-off-by: Mahesh <maheshkasbe010@gmail.com>
---
 .github/workflows/deploy.yaml | 49 +++++++++++++++++++++++++++++++++++
 1 file changed, 49 insertions(+)
 create mode 100644 .github/workflows/deploy.yaml

diff --git a/.github/workflows/deploy.yaml b/.github/workflows/deploy.yaml
new file mode 100644
index 00000000..342fed20
--- /dev/null
+++ b/.github/workflows/deploy.yaml
@@ -0,0 +1,49 @@
+name: Deploy to ECR
+
+on:
+  pull_request_target:
+    types:
+      - closed
+
+jobs:
+  if_merged:
+    if: github.event.pull_request.merged == true
+    runs-on: ubuntu-latest
+   
+    steps:
+
+    - name: Check out code
+      uses: actions/checkout@v2
+
+    - name: Build the Docker-compose file
+      run: docker-compose -f "docker-compose.yaml" up -d --build
+
+    - name: Show containers
+      run: docker ps -a
+    
+    - name: Configure AWS credentials
+      uses: aws-actions/configure-aws-credentials@v1
+      with:
+        aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
+        aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+        aws-region: us-east-1
+
+    - name: Login to Amazon ECR
+      id: login-ecr
+      uses: aws-actions/amazon-ecr-login@v1
+      with:
+          registry-type: public
+    
+    - name: Set outputs
+      id: vars
+      run: echo "sha_short=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT
+
+    - name: Build, tag, and push image to Amazon ECR
+      env:
+        ECR_REGISTRY: ${{ steps.login-ecr.outputs.registry }}
+        REGISTRY_ALIAS: ${{ secrets.AWS_REGISTRY_ALIAS }}
+        ECR_REPOSITORY: ${{ secrets.AWS_ECR_REPOSITORY }}
+        IMAGE_TAG: ${{ steps.vars.outputs.sha_short }}
+      run: |
+        docker build -t $ECR_REGISTRY/$REGISTRY_ALIAS/$ECR_REPOSITORY:$IMAGE_TAG .
+        docker push $ECR_REGISTRY/$REGISTRY_ALIAS/$ECR_REPOSITORY:$IMAGE_TAG
\ No newline at end of file

From efee21fe712fcaa4a9c80f407da656ecea53b97b Mon Sep 17 00:00:00 2001
From: Mahesh <maheshkasbe010@gmail.com>
Date: Wed, 21 Jun 2023 20:50:29 +0530
Subject: [PATCH 05/20] Added elasticsearch support for docker-compose file &
 deploy workflow

Signed-off-by: Mahesh <maheshkasbe010@gmail.com>
---
 .github/workflows/deploy.yaml | 16 ++++++++--------
 docker-compose.yaml           | 14 +++++++++++++-
 graphspace/settings/base.py   |  2 +-
 3 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/deploy.yaml b/.github/workflows/deploy.yaml
index 342fed20..6e47f0a3 100644
--- a/.github/workflows/deploy.yaml
+++ b/.github/workflows/deploy.yaml
@@ -1,17 +1,13 @@
 name: Deploy to ECR
 
 on:
-  pull_request_target:
-    types:
-      - closed
+  [push, pull_request]
 
 jobs:
-  if_merged:
-    if: github.event.pull_request.merged == true
-    runs-on: ubuntu-latest
-   
+   deploy:
+    runs-on: ubuntu-latest  
     steps:
-
+    
     - name: Check out code
       uses: actions/checkout@v2
 
@@ -22,6 +18,7 @@ jobs:
       run: docker ps -a
     
     - name: Configure AWS credentials
+      if: ${{ github.ref == 'refs/heads/master' }}
       uses: aws-actions/configure-aws-credentials@v1
       with:
         aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
@@ -29,6 +26,7 @@ jobs:
         aws-region: us-east-1
 
     - name: Login to Amazon ECR
+      if: ${{ github.ref == 'refs/heads/master' }}
       id: login-ecr
       uses: aws-actions/amazon-ecr-login@v1
       with:
@@ -36,9 +34,11 @@ jobs:
     
     - name: Set outputs
       id: vars
+      if: ${{ github.ref == 'refs/heads/master' }}
       run: echo "sha_short=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT
 
     - name: Build, tag, and push image to Amazon ECR
+      if: ${{ github.ref == 'refs/heads/master' }}
       env:
         ECR_REGISTRY: ${{ steps.login-ecr.outputs.registry }}
         REGISTRY_ALIAS: ${{ secrets.AWS_REGISTRY_ALIAS }}
diff --git a/docker-compose.yaml b/docker-compose.yaml
index 854ebdec..63662981 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -13,6 +13,16 @@ services:
       - pgdata:/var/lib/PostgreSQL/data
       - ./db.sh:/docker-entrypoint-initdb.d/create_extensions.sh
 
+  elasticsearch:
+    restart: always
+    image: docker.elastic.co/elasticsearch/elasticsearch:7.5.2
+    ports:
+      - "9200:9200"
+    environment:
+      - discovery.type=single-node
+    volumes:
+      - esdata:/var/lib/elasticsearch/data
+
   graphspace:
     restart: always
     environment:
@@ -33,6 +43,8 @@ services:
             python manage.py runserver 0.0.0.0:8000 --settings=graphspace.settings.local"
     depends_on:
       - db
+      - elasticsearch
 
 volumes:
-  pgdata:
\ No newline at end of file
+  pgdata:
+  esdata:
\ No newline at end of file
diff --git a/graphspace/settings/base.py b/graphspace/settings/base.py
index f0bf095c..366da397 100644
--- a/graphspace/settings/base.py
+++ b/graphspace/settings/base.py
@@ -140,7 +140,7 @@
 )
 
 BASE = declarative_base()
-ELASTIC_CLIENT = Elasticsearch()
+ELASTIC_CLIENT = Elasticsearch(['elasticsearch:9200'])
 
 LOGGING = {
     'version': 1,

From 6cfc7b083de25bc9a6c92dbc3948403022af0869 Mon Sep 17 00:00:00 2001
From: Mahesh <maheshkasbe010@gmail.com>
Date: Sun, 25 Jun 2023 21:43:32 +0530
Subject: [PATCH 06/20] Added environment variable support for production file

Signed-off-by: Mahesh <maheshkasbe010@gmail.com>
---
 .gitignore                        |  1 -
 docker-compose.prod.yaml          |  2 ++
 graphspace/settings/production.py | 49 +++++++++++++++++++++++++++++++
 secrets.env                       | 18 ++++++++++++
 4 files changed, 69 insertions(+), 1 deletion(-)
 create mode 100644 graphspace/settings/production.py
 create mode 100644 secrets.env

diff --git a/.gitignore b/.gitignore
index ee495b76..20f65f20 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,7 +3,6 @@
 
 # Ignore updates to production.py,
 # It's meant to be local
-production.py
 
 # Ignore Mac DS_Store files
 .DS_Store
diff --git a/docker-compose.prod.yaml b/docker-compose.prod.yaml
index df319ac5..9029ca0d 100644
--- a/docker-compose.prod.yaml
+++ b/docker-compose.prod.yaml
@@ -8,6 +8,8 @@ services:
       context: .
     ports:
       - "8000:8000"
+    env_file:
+      - ./secrets.env
     volumes:
       - .:/app
     command: >
diff --git a/graphspace/settings/production.py b/graphspace/settings/production.py
new file mode 100644
index 00000000..20c2c2cb
--- /dev/null
+++ b/graphspace/settings/production.py
@@ -0,0 +1,49 @@
+from graphspace.settings.base import *
+
+# variables for setting up account through which GraphSpace emails
+EMAIL_HOST = os.environ.get('EMAIL_HOST')
+EMAIL_HOST_USER = os.environ.get('EMAIL_HOST_USER')
+EMAIL_HOST_PASSWORD = os.environ.get('EMAIL_HOST_PASSWORD')
+
+# If error is thrown, display the error in the browser (ONLY FOR LOCAL MACHINES)
+DEBUG = os.environ.get('DEBUG')
+TEMPLATE_DEBUG = os.environ.get('TEMPLATE_DEBUG')
+MAINTENANCE = os.environ.get('MAINTENANCE')
+
+# URL through which to access graphspace
+URL_PATH = os.environ.get('URL_PATH')
+
+# If tracking is enabled for GraphSpace in Google Analytics
+GOOGLE_ANALYTICS_PROPERTY_ID = os.environ.get('GOOGLE_ANALYTICS_PROPERTY_ID')
+
+# Keys given by creating a requestor account on Amazon Mechanical Turk (https://www.mturk.com/mturk/welcome)
+AWSACCESSKEYID = os.environ.get('AWSACCESSKEYID')
+SECRETKEY = os.environ.get('SECRETKEYOST')
+
+# Path to GraphSPace
+PATH = os.environ.get('PATH')
+
+# SHOULD NEVER CHANGE THIS VALUE
+SECRET_KEY = os.environ.get('SECRET_KEY')
+
+# If needing to test on production mturk account (real money)
+# AWS_URL = 'https://mechanicalturk.amazonaws.com'
+
+# Sandbox (development) MTURK (fake money used)
+AWS_URL = os.environ.get('AWS_URL')
+
+# To configure the application to use the Console Backend for sending e-mail. It writes e-mails to standard out instead of sending them.
+# http://stackoverflow.com/questions/4642011/test-sending-email-without-email-server
+EMAIL_BACKEND = os.environ.get('EMAIL_BACKEND')
+
+
+DATABASES = {
+    'default': {
+        'ENGINE': 'django.db.backends.postgresql_psycopg2',
+        'NAME':  os.environ.get('POSTGRES_DB'),
+        'USER':  os.environ.get('POSTGRES_USER'),
+        'PASSWORD': os.environ.get('POSTGRES_PASSWORD'),
+        'HOST': os.environ.get('POSTGRES_HOST'),
+        'PORT': os.environ.get('POSTGRES_PORT')
+    }
+}
diff --git a/secrets.env b/secrets.env
new file mode 100644
index 00000000..14abd917
--- /dev/null
+++ b/secrets.env
@@ -0,0 +1,18 @@
+EMAIL_HOST=None
+EMAIL_HOST_USER=None
+EMAIL_HOST_PASSWORD=None
+DEBUG=False
+TEMPLATE_DEBUG=True
+MAINTENANCE=False
+URL_PATH=http://localhost=8000/
+GOOGLE_ANALYTICS_PROPERTY_ID=UA-00000000-0
+AWSACCESSKEYID=None
+SECRETKEY=None
+SECRET_KEY=this-is-a-secret-key-for-local-settings-only
+AWS_URL=https://mechanicalturk.sandbox.amazonaws.com
+EMAIL_BACKEND=django.core.mail.backends.console.EmailBackend
+POSTGRES_DB=graphspace
+POSTGRES_USER=postgres
+POSTGRES_PASSWORD=postgres
+POSTGRES_HOST=db
+POSTGRES_PORT=5432
\ No newline at end of file

From 9d1336bc8c867b830db6220eb57b55413391b6be Mon Sep 17 00:00:00 2001
From: Mahesh <maheshkasbe010@gmail.com>
Date: Mon, 26 Jun 2023 20:38:33 +0530
Subject: [PATCH 07/20] Some additions to Production file

Signed-off-by: Mahesh <maheshkasbe010@gmail.com>
---
 Dockerfile                        | 2 +-
 docker-compose.prod.yaml          | 3 ++-
 graphspace/settings/production.py | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 023addab..55f710ee 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:18.04 AS prod
+FROM ubuntu:18.04
 WORKDIR /app
 RUN apt-get -y update && apt-get install -y npm && apt-get install -y git
 RUN npm install bower -g
diff --git a/docker-compose.prod.yaml b/docker-compose.prod.yaml
index 9029ca0d..16c26c85 100644
--- a/docker-compose.prod.yaml
+++ b/docker-compose.prod.yaml
@@ -13,4 +13,5 @@ services:
     volumes:
       - .:/app
     command: >
-      sh -c "python manage.py migrate && python manage.py runserver"
\ No newline at end of file
+      sh -c "python manage.py migrate 
+            && python manage.py runserver"
\ No newline at end of file
diff --git a/graphspace/settings/production.py b/graphspace/settings/production.py
index 20c2c2cb..23b7fa28 100644
--- a/graphspace/settings/production.py
+++ b/graphspace/settings/production.py
@@ -21,7 +21,7 @@
 SECRETKEY = os.environ.get('SECRETKEYOST')
 
 # Path to GraphSPace
-PATH = os.environ.get('PATH')
+PATH = os.environ.get('PATH', '/path_to_graphspace')
 
 # SHOULD NEVER CHANGE THIS VALUE
 SECRET_KEY = os.environ.get('SECRET_KEY')

From 9249d895276a8aab1dff11d00c6a310fd1e908ee Mon Sep 17 00:00:00 2001
From: Mahesh <maheshkasbe010@gmail.com>
Date: Fri, 30 Jun 2023 19:38:59 +0530
Subject: [PATCH 08/20] Added some comments for better understanding

Signed-off-by: Mahesh <maheshkasbe010@gmail.com>
---
 .github/workflows/deploy.yaml | 3 +--
 graphspace/settings/base.py   | 1 +
 graphspace/settings/local.py  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/deploy.yaml b/.github/workflows/deploy.yaml
index 6e47f0a3..1bcfa56f 100644
--- a/.github/workflows/deploy.yaml
+++ b/.github/workflows/deploy.yaml
@@ -1,7 +1,6 @@
 name: Deploy to ECR
 
-on:
-  [push, pull_request]
+on: [push, pull_request]
 
 jobs:
    deploy:
diff --git a/graphspace/settings/base.py b/graphspace/settings/base.py
index 366da397..980f3fca 100644
--- a/graphspace/settings/base.py
+++ b/graphspace/settings/base.py
@@ -140,6 +140,7 @@
 )
 
 BASE = declarative_base()
+# for connecting with elasticsearch client using hostname and port
 ELASTIC_CLIENT = Elasticsearch(['elasticsearch:9200'])
 
 LOGGING = {
diff --git a/graphspace/settings/local.py b/graphspace/settings/local.py
index a16e92ce..be5f1ad1 100644
--- a/graphspace/settings/local.py
+++ b/graphspace/settings/local.py
@@ -36,7 +36,7 @@
 # http://stackoverflow.com/questions/4642011/test-sending-email-without-email-server
 EMAIL_BACKEND = 'django.core.mail.backends.console.EmailBackend'
 
-
+# Added enviornment variable option to run with doccker-compose file and also with local dev setup
 DATABASES = {
     'default': {
         'ENGINE': 'django.db.backends.postgresql_psycopg2',

From f8ce6e9b562ab5577f98ae94e07cde1234312796 Mon Sep 17 00:00:00 2001
From: Mahesh <maheshkasbe010@gmail.com>
Date: Sun, 2 Jul 2023 19:38:35 +0530
Subject: [PATCH 09/20] Added some extra workflows for quality & labeling

Signed-off-by: Mahesh <maheshkasbe010@gmail.com>
---
 .github/auto_assign.yml               | 14 ++++++++++++
 .github/pr-labeler.yml                |  3 +++
 .github/workflows/assign_pr.yaml      | 12 ++++++++++
 .github/workflows/branch_labeler.yaml | 32 +++++++++++++++++++++++++++
 .github/workflows/issue_label.yaml    | 14 ++++++++++++
 docker-compose.prod.yaml              |  4 ++--
 6 files changed, 77 insertions(+), 2 deletions(-)
 create mode 100644 .github/auto_assign.yml
 create mode 100644 .github/pr-labeler.yml
 create mode 100644 .github/workflows/assign_pr.yaml
 create mode 100644 .github/workflows/branch_labeler.yaml
 create mode 100644 .github/workflows/issue_label.yaml

diff --git a/.github/auto_assign.yml b/.github/auto_assign.yml
new file mode 100644
index 00000000..a6b9a913
--- /dev/null
+++ b/.github/auto_assign.yml
@@ -0,0 +1,14 @@
+# Set to true to add reviewers to pull requests
+addReviewers: true
+
+# Set to true to add assignees to pull requests
+addAssignees: false
+
+# A list of reviewers to be added to pull requests (GitHub user name)
+reviewers:
+  - maheshkasabe
+  - mrhacker4657
+
+# A number of reviewers added to the pull request
+# Set 0 to add all the reviewers (default: 0)
+numberOfReviewers: 0
diff --git a/.github/pr-labeler.yml b/.github/pr-labeler.yml
new file mode 100644
index 00000000..dcd78c49
--- /dev/null
+++ b/.github/pr-labeler.yml
@@ -0,0 +1,3 @@
+feature: ['feature/*', 'feat/*']
+fix: fix/*
+chore :hammer:: chore/*
\ No newline at end of file
diff --git a/.github/workflows/assign_pr.yaml b/.github/workflows/assign_pr.yaml
new file mode 100644
index 00000000..91ede587
--- /dev/null
+++ b/.github/workflows/assign_pr.yaml
@@ -0,0 +1,12 @@
+name: 'Auto Assign'
+on:
+  pull_request_target:
+    types: [opened, ready_for_review]
+
+jobs:
+  add-reviews:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: kentaro-m/auto-assign-action@v1.2.5
+        with:
+          configuration-path: '.github/auto_assign.yml' # Only needed if you use something other than .github/auto_assign.yml
\ No newline at end of file
diff --git a/.github/workflows/branch_labeler.yaml b/.github/workflows/branch_labeler.yaml
new file mode 100644
index 00000000..6d1a4db5
--- /dev/null
+++ b/.github/workflows/branch_labeler.yaml
@@ -0,0 +1,32 @@
+name: PR Labeler
+on: pull_request_target
+
+permissions:
+  contents: read
+  pull-requests: write
+
+jobs:
+  pr-labeler:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: branch-label
+        uses: TimonVS/pr-labeler-action@v4
+        with:
+          repo-token: ${{ secrets.GITHUB_TOKEN }}
+          configuration-path: .github/pr-labeler.yml # optional, .github/pr-labeler.yml is the default value
+      
+      - name: size-label
+        uses: "pascalgn/size-label-action@v0.4.2"
+        env:
+          GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
+        with:
+          sizes: >
+            {
+              "0": "XS",
+              "20": "S",
+              "50": "M",
+              "200": "L",
+              "800": "XL",
+              "2000": "XXL"
+            }
\ No newline at end of file
diff --git a/.github/workflows/issue_label.yaml b/.github/workflows/issue_label.yaml
new file mode 100644
index 00000000..e0dd0e77
--- /dev/null
+++ b/.github/workflows/issue_label.yaml
@@ -0,0 +1,14 @@
+name: Labeling new issue
+on:
+  issues:
+    types: ['opened','edited']
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: Renato66/auto-label@v2
+        with:
+          repo-token: ${{ secrets.GITHUB_TOKEN }}
+          ignore-comments: true
+          labels-synonyms: '{"bug":["error","need fix","not working"],"enhancement":["upgrade"],"question":["help"]}'
+          labels-not-allowed: '["good first issue"]'
\ No newline at end of file
diff --git a/docker-compose.prod.yaml b/docker-compose.prod.yaml
index 16c26c85..b61b6fcb 100644
--- a/docker-compose.prod.yaml
+++ b/docker-compose.prod.yaml
@@ -13,5 +13,5 @@ services:
     volumes:
       - .:/app
     command: >
-      sh -c "python manage.py migrate 
-            && python manage.py runserver"
\ No newline at end of file
+      sh -c "python manage.py migrate && 
+              python manage.py runserver"
\ No newline at end of file

From cc653d8708dfc3445045bca907e8e4b6b2b17ac4 Mon Sep 17 00:00:00 2001
From: Mahesh <maheshkasbe010@gmail.com>
Date: Sun, 2 Jul 2023 20:16:39 +0530
Subject: [PATCH 10/20] Removed docker-compose volume to install bower
 compoenents

---
 docker-compose.prod.yaml | 2 --
 docker-compose.yaml      | 2 --
 2 files changed, 4 deletions(-)

diff --git a/docker-compose.prod.yaml b/docker-compose.prod.yaml
index b61b6fcb..ca566632 100644
--- a/docker-compose.prod.yaml
+++ b/docker-compose.prod.yaml
@@ -10,8 +10,6 @@ services:
       - "8000:8000"
     env_file:
       - ./secrets.env
-    volumes:
-      - .:/app
     command: >
       sh -c "python manage.py migrate && 
               python manage.py runserver"
\ No newline at end of file
diff --git a/docker-compose.yaml b/docker-compose.yaml
index 63662981..8d8ec000 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -36,8 +36,6 @@ services:
       context: .
     ports:
       - "8000:8000"
-    volumes:
-      - .:/app
     command: >
       sh -c "python manage.py migrate --settings=graphspace.settings.local && 
             python manage.py runserver 0.0.0.0:8000 --settings=graphspace.settings.local"

From 20fa48532659bc1a2c0fd044397a3127f6cb695a Mon Sep 17 00:00:00 2001
From: Mahesh <maheshkasbe010@gmail.com>
Date: Mon, 3 Jul 2023 22:19:20 +0530
Subject: [PATCH 11/20] updated postgres version and added libpq-dev package

Signed-off-by: Mahesh <maheshkasbe010@gmail.com>
---
 Dockerfile          | 2 +-
 docker-compose.yaml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 55f710ee..bad9fc1b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
 FROM ubuntu:18.04
 WORKDIR /app
-RUN apt-get -y update && apt-get install -y npm && apt-get install -y git
+RUN apt-get -y update && apt-get install -y npm && apt-get install -y git && apt-get install -y libpq-dev
 RUN npm install bower -g
 RUN apt-get install -y python-pip && pip install --upgrade pip
 COPY . /app
diff --git a/docker-compose.yaml b/docker-compose.yaml
index 8d8ec000..01b2007f 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -1,7 +1,7 @@
 version: "3.4"
 services:
   db:
-    image: postgres
+    image: postgres:9.6
     restart: always
     environment:
       POSTGRES_DB: graphspace

From acf602bfb5635936b86c5cf696e97945f6afabca Mon Sep 17 00:00:00 2001
From: Mahesh <maheshkasbe010@gmail.com>
Date: Sat, 8 Jul 2023 20:59:38 +0530
Subject: [PATCH 12/20] Mac docker install issues resolved

---
 Dockerfile | 2 +-
 db.sh      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
 mode change 100644 => 100755 db.sh

diff --git a/Dockerfile b/Dockerfile
index bad9fc1b..b6abc11a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
 FROM ubuntu:18.04
 WORKDIR /app
-RUN apt-get -y update && apt-get install -y npm && apt-get install -y git && apt-get install -y libpq-dev
+RUN apt-get -y update && apt-get install -y npm && apt-get install -y git && apt-get install -y libpq-dev &&  apt-get install -y libxml2 && apt-get install -y libxslt-dev
 RUN npm install bower -g
 RUN apt-get install -y python-pip && pip install --upgrade pip
 COPY . /app
diff --git a/db.sh b/db.sh
old mode 100644
new mode 100755
index b76d1b9b..327ad6f8
--- a/db.sh
+++ b/db.sh
@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!bin/sh
 echo "enabling pg_trgm & btree_gin on database $POSTGRES_DB"
 psql -U $POSTGRES_USER --dbname="$POSTGRES_DB" <<-'EOSQL'
 create extension if not exists pg_trgm;

From 0c5b156a2b6b99f7dbda6b3fb55a19ef2cef598e Mon Sep 17 00:00:00 2001
From: Mahesh <maheshkasbe010@gmail.com>
Date: Wed, 19 Jul 2023 20:34:52 +0530
Subject: [PATCH 13/20] Added Trivy Scanner

---
 .github/workflows/Image_scan.yaml | 24 ++++++++++++++++++++++++
 Dockerfile                        |  8 ++++++--
 2 files changed, 30 insertions(+), 2 deletions(-)
 create mode 100644 .github/workflows/Image_scan.yaml

diff --git a/.github/workflows/Image_scan.yaml b/.github/workflows/Image_scan.yaml
new file mode 100644
index 00000000..6c6bc2a7
--- /dev/null
+++ b/.github/workflows/Image_scan.yaml
@@ -0,0 +1,24 @@
+name: build
+
+on: [push, pull_request]
+
+jobs:
+  build:
+    name: Build
+    runs-on: ubuntu-20.04
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v2
+
+      - name: Build an image from Dockerfile
+        run: docker build -t docker.io/my-organization/my-app:${{ github.sha }} .
+
+      - name: Run Trivy vulnerability scanner
+        uses: aquasecurity/trivy-action@master
+        with:
+          image-ref: 'docker.io/my-organization/my-app:${{ github.sha }}'
+          format: 'table'
+          exit-code: '0'
+          ignore-unfixed: true
+          vuln-type: 'os,library'
+          severity: 'CRITICAL,HIGH'
\ No newline at end of file
diff --git a/Dockerfile b/Dockerfile
index b6abc11a..d7399a4b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,7 +1,11 @@
 FROM ubuntu:18.04
 WORKDIR /app
-RUN apt-get -y update && apt-get install -y npm && apt-get install -y git && apt-get install -y libpq-dev &&  apt-get install -y libxml2 && apt-get install -y libxslt-dev
-RUN npm install bower -g
+RUN apt-get -y update && apt-get install -y \
+    npm \
+    git \
+    libpq-dev \
+    libxml2 \
+    libxslt-dev
 RUN apt-get install -y python-pip && pip install --upgrade pip
 COPY . /app
 RUN pip install -r requirements.txt

From 2910aba7dd0ec06746ffea49ff953653b488c1b5 Mon Sep 17 00:00:00 2001
From: Mahesh <maheshkasbe010@gmail.com>
Date: Wed, 19 Jul 2023 20:42:21 +0530
Subject: [PATCH 14/20] Added some extra imporvements

---
 .github/workflows/Image_scan.yaml | 2 +-
 Dockerfile                        | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/Image_scan.yaml b/.github/workflows/Image_scan.yaml
index 6c6bc2a7..5097089f 100644
--- a/.github/workflows/Image_scan.yaml
+++ b/.github/workflows/Image_scan.yaml
@@ -1,4 +1,4 @@
-name: build
+name: Trivy Docker Image Scan 
 
 on: [push, pull_request]
 
diff --git a/Dockerfile b/Dockerfile
index d7399a4b..d645b8dd 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -6,6 +6,7 @@ RUN apt-get -y update && apt-get install -y \
     libpq-dev \
     libxml2 \
     libxslt-dev
+RUN npm install bower -g
 RUN apt-get install -y python-pip && pip install --upgrade pip
 COPY . /app
 RUN pip install -r requirements.txt

From c8155996effe8746fb5e1d6309cc99a278eaa3ae Mon Sep 17 00:00:00 2001
From: Mahesh <maheshkasbe010@gmail.com>
Date: Mon, 24 Jul 2023 19:27:28 +0530
Subject: [PATCH 15/20] Added dockerhub ci workflow

---
 .github/workflows/ci-graphspace.yaml | 31 ++++++++++++++++++++++++++++
 .github/workflows/deploy.yaml        |  2 +-
 README.md                            |  1 +
 3 files changed, 33 insertions(+), 1 deletion(-)
 create mode 100644 .github/workflows/ci-graphspace.yaml

diff --git a/.github/workflows/ci-graphspace.yaml b/.github/workflows/ci-graphspace.yaml
new file mode 100644
index 00000000..245e0b78
--- /dev/null
+++ b/.github/workflows/ci-graphspace.yaml
@@ -0,0 +1,31 @@
+name: Docker Build & Push Graphspace
+
+on: [push, pull_request]
+
+jobs:
+
+  build:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v3
+    
+    - name: login to docker hub 
+      uses: docker/login-action@v2
+      with: 
+        username: ${{ secrets.DOCKER_USERNAME }}
+        password: ${{ secrets.DOCKER_TOKEN }}
+
+    - name: Set outputs
+      id: vars
+      if: ${{ github.ref == 'refs/heads/master' }}
+      run: echo "sha_short=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT
+    
+    - name: create image
+      run: docker build -t graphspace . 
+
+    - name: push image 
+      run: |
+        docker tag graphspace maheshkasbe/graphspace:${{ steps.vars.outputs.sha_short }}
+        docker tag graphspace maheshkasbe/graphspace:latest
+        docker push maheshkasbe/graphspace:latest
+        docker push maheshkasbe/graphspace:${{ steps.vars.outputs.sha_short }}
\ No newline at end of file
diff --git a/.github/workflows/deploy.yaml b/.github/workflows/deploy.yaml
index 1bcfa56f..463ff712 100644
--- a/.github/workflows/deploy.yaml
+++ b/.github/workflows/deploy.yaml
@@ -1,4 +1,4 @@
-name: Deploy to ECR
+name: Push to ECR
 
 on: [push, pull_request]
 
diff --git a/README.md b/README.md
index 22ffebc1..616e15d9 100644
--- a/README.md
+++ b/README.md
@@ -14,6 +14,7 @@ Requirements
 Installation Instructions
 ===================================
 * [Running GraphSpace Locally](https://github.com/Murali-group/GraphSpace/wiki/Running-GraphSpace-locally)
+* [Running Graphspace Locally using Docker & Docker‐Compose](Running-Graphspace-using-Docker-&-Docker‐Compose)
 * [Running GraphSpace on Apache](https://github.com/Murali-group/GraphSpace/wiki/Running-GraphSpace-on-Apache)
 
 Documentation

From 95d2d234e75e2d67cc92b3964a36f3e60088bfa9 Mon Sep 17 00:00:00 2001
From: Mahesh <maheshkasbe010@gmail.com>
Date: Mon, 24 Jul 2023 19:34:18 +0530
Subject: [PATCH 16/20] Added workflow rule to push image only on merging to
 master branch

Signed-off-by: Mahesh <maheshkasbe010@gmail.com>
---
 .github/workflows/ci-graphspace.yaml | 1 +
 README.md                            | 2 +-
 docker-compose.yaml                  | 5 +++--
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/ci-graphspace.yaml b/.github/workflows/ci-graphspace.yaml
index 245e0b78..5377dd63 100644
--- a/.github/workflows/ci-graphspace.yaml
+++ b/.github/workflows/ci-graphspace.yaml
@@ -24,6 +24,7 @@ jobs:
       run: docker build -t graphspace . 
 
     - name: push image 
+      if: ${{ github.ref == 'refs/heads/master' }}
       run: |
         docker tag graphspace maheshkasbe/graphspace:${{ steps.vars.outputs.sha_short }}
         docker tag graphspace maheshkasbe/graphspace:latest
diff --git a/README.md b/README.md
index 616e15d9..418a22f9 100644
--- a/README.md
+++ b/README.md
@@ -14,7 +14,7 @@ Requirements
 Installation Instructions
 ===================================
 * [Running GraphSpace Locally](https://github.com/Murali-group/GraphSpace/wiki/Running-GraphSpace-locally)
-* [Running Graphspace Locally using Docker & Docker‐Compose](Running-Graphspace-using-Docker-&-Docker‐Compose)
+* [Running Graphspace Locally using Docker & Docker‐Compose](https://github.com/Murali-group/GraphSpace/wiki/Running-Graphspace-using-Docker-&-Docker‐Compose)
 * [Running GraphSpace on Apache](https://github.com/Murali-group/GraphSpace/wiki/Running-GraphSpace-on-Apache)
 
 Documentation
diff --git a/docker-compose.yaml b/docker-compose.yaml
index 01b2007f..99d0f0fd 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -25,6 +25,7 @@ services:
 
   graphspace:
     restart: always
+    image: maheshkasbe/graphspace:latest
     environment:
       POSTGRES_HOST: db
       POSTGRES_DB: graphspace
@@ -32,8 +33,8 @@ services:
       POSTGRES_PASSWORD: postgres
     stdin_open: true # docker run -i
     tty: true # docker run -t
-    build:
-      context: .
+    # build:
+    #   context: .
     ports:
       - "8000:8000"
     command: >

From a41879e3002a0b982b983a506828a47738982c38 Mon Sep 17 00:00:00 2001
From: Mahesh <maheshkasbe010@gmail.com>
Date: Sat, 5 Aug 2023 21:48:01 +0530
Subject: [PATCH 17/20] Added Comments

Signed-off-by: Mahesh <maheshkasbe010@gmail.com>
---
 .github/auto_assign.yml               |  4 ++--
 .github/pr-labeler.yml                |  2 +-
 .github/workflows/Image_scan.yaml     |  2 +-
 .github/workflows/assign_pr.yaml      |  3 ++-
 .github/workflows/branch_labeler.yaml |  4 ++--
 .github/workflows/ci-graphspace.yaml  |  6 +++---
 .github/workflows/deploy.yaml         |  2 +-
 .github/workflows/issue_label.yaml    |  3 ++-
 Dockerfile                            | 19 ++++++++++++++++++-
 db.sh                                 |  4 +++-
 docker-compose.yaml                   |  3 +++
 install.sh                            |  1 +
 12 files changed, 39 insertions(+), 14 deletions(-)

diff --git a/.github/auto_assign.yml b/.github/auto_assign.yml
index a6b9a913..3526291a 100644
--- a/.github/auto_assign.yml
+++ b/.github/auto_assign.yml
@@ -6,8 +6,8 @@ addAssignees: false
 
 # A list of reviewers to be added to pull requests (GitHub user name)
 reviewers:
-  - maheshkasabe
-  - mrhacker4657
+  - adbharadwaj # Aditya Bharadwaj
+#(optional)  - tmmurali
 
 # A number of reviewers added to the pull request
 # Set 0 to add all the reviewers (default: 0)
diff --git a/.github/pr-labeler.yml b/.github/pr-labeler.yml
index dcd78c49..9c4df5e4 100644
--- a/.github/pr-labeler.yml
+++ b/.github/pr-labeler.yml
@@ -1,3 +1,3 @@
 feature: ['feature/*', 'feat/*']
 fix: fix/*
-chore :hammer:: chore/*
\ No newline at end of file
+chore: chore/*
\ No newline at end of file
diff --git a/.github/workflows/Image_scan.yaml b/.github/workflows/Image_scan.yaml
index 5097089f..779005b2 100644
--- a/.github/workflows/Image_scan.yaml
+++ b/.github/workflows/Image_scan.yaml
@@ -13,7 +13,7 @@ jobs:
       - name: Build an image from Dockerfile
         run: docker build -t docker.io/my-organization/my-app:${{ github.sha }} .
 
-      - name: Run Trivy vulnerability scanner
+      - name: Run Trivy vulnerability scanner # Runs the Trivy Vulnerability Scanner and Prints the results  
         uses: aquasecurity/trivy-action@master
         with:
           image-ref: 'docker.io/my-organization/my-app:${{ github.sha }}'
diff --git a/.github/workflows/assign_pr.yaml b/.github/workflows/assign_pr.yaml
index 91ede587..5e2231ba 100644
--- a/.github/workflows/assign_pr.yaml
+++ b/.github/workflows/assign_pr.yaml
@@ -7,6 +7,7 @@ jobs:
   add-reviews:
     runs-on: ubuntu-latest
     steps:
-      - uses: kentaro-m/auto-assign-action@v1.2.5
+      - name: Auto Assign Reviewer # Assigns Reviwer from reviewers list to the Pull Request  
+        uses: kentaro-m/auto-assign-action@v1.2.5
         with:
           configuration-path: '.github/auto_assign.yml' # Only needed if you use something other than .github/auto_assign.yml
\ No newline at end of file
diff --git a/.github/workflows/branch_labeler.yaml b/.github/workflows/branch_labeler.yaml
index 6d1a4db5..a75b25de 100644
--- a/.github/workflows/branch_labeler.yaml
+++ b/.github/workflows/branch_labeler.yaml
@@ -10,13 +10,13 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - name: branch-label
+      - name: branch-label # Labels the Pull Request by branch name as which branch the pr is raised to
         uses: TimonVS/pr-labeler-action@v4
         with:
           repo-token: ${{ secrets.GITHUB_TOKEN }}
           configuration-path: .github/pr-labeler.yml # optional, .github/pr-labeler.yml is the default value
       
-      - name: size-label
+      - name: size-label # Labels the Pull Request by the no of lines of code
         uses: "pascalgn/size-label-action@v0.4.2"
         env:
           GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
diff --git a/.github/workflows/ci-graphspace.yaml b/.github/workflows/ci-graphspace.yaml
index 5377dd63..763e18a3 100644
--- a/.github/workflows/ci-graphspace.yaml
+++ b/.github/workflows/ci-graphspace.yaml
@@ -15,15 +15,15 @@ jobs:
         username: ${{ secrets.DOCKER_USERNAME }}
         password: ${{ secrets.DOCKER_TOKEN }}
 
-    - name: Set outputs
+    - name: Set Tag
       id: vars
       if: ${{ github.ref == 'refs/heads/master' }}
       run: echo "sha_short=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT
     
-    - name: create image
+    - name: Create Graphspace image
       run: docker build -t graphspace . 
 
-    - name: push image 
+    - name: Push image to Dockerhub
       if: ${{ github.ref == 'refs/heads/master' }}
       run: |
         docker tag graphspace maheshkasbe/graphspace:${{ steps.vars.outputs.sha_short }}
diff --git a/.github/workflows/deploy.yaml b/.github/workflows/deploy.yaml
index 463ff712..40ffba64 100644
--- a/.github/workflows/deploy.yaml
+++ b/.github/workflows/deploy.yaml
@@ -31,7 +31,7 @@ jobs:
       with:
           registry-type: public
     
-    - name: Set outputs
+    - name: Set Tag
       id: vars
       if: ${{ github.ref == 'refs/heads/master' }}
       run: echo "sha_short=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT
diff --git a/.github/workflows/issue_label.yaml b/.github/workflows/issue_label.yaml
index e0dd0e77..2d66a45b 100644
--- a/.github/workflows/issue_label.yaml
+++ b/.github/workflows/issue_label.yaml
@@ -6,7 +6,8 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-      - uses: Renato66/auto-label@v2
+      - name: Issue Label #Labels the issue by the description of the issue 
+        uses: Renato66/auto-label@v2 
         with:
           repo-token: ${{ secrets.GITHUB_TOKEN }}
           ignore-comments: true
diff --git a/Dockerfile b/Dockerfile
index d645b8dd..f17aee03 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,14 +1,31 @@
+#Base Image to install & Run Graphspace
 FROM ubuntu:18.04
+
+#Created a app directory for graphspace
 WORKDIR /app
+
+#Installs required & dev packages to smoothly install graphspace rquirements on ubuntu and mac as well   
 RUN apt-get -y update && apt-get install -y \
-    npm \
+    npm \ 
     git \
     libpq-dev \
     libxml2 \
     libxslt-dev
+
+#Installs npm globally
 RUN npm install bower -g
+
+#Installs Pip package and upgrades it 
 RUN apt-get install -y python-pip && pip install --upgrade pip
+
+#Copies whole graphspace project in app directory
 COPY . /app
+
+#Installs Graphspace requirements
 RUN pip install -r requirements.txt
+
+#Installs Graphspace
 RUN sh install.sh
+
+#Exposes the port 8000 to discover graphspace container
 EXPOSE 8000
\ No newline at end of file
diff --git a/db.sh b/db.sh
index 327ad6f8..c2b64057 100755
--- a/db.sh
+++ b/db.sh
@@ -1,6 +1,8 @@
 #!bin/sh
+
+#connects to the postgres database & creates pg_trgm & btree_gin extensions
 echo "enabling pg_trgm & btree_gin on database $POSTGRES_DB"
-psql -U $POSTGRES_USER --dbname="$POSTGRES_DB" <<-'EOSQL'
+psql -U $POSTGRES_USER --dbname="$POSTGRES_DB" <<-'EOSQL' 
 create extension if not exists pg_trgm;
 create extension if not exists btree_gin;
 EOSQL
diff --git a/docker-compose.yaml b/docker-compose.yaml
index 99d0f0fd..05bac910 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -1,5 +1,6 @@
 version: "3.4"
 services:
+#Postgres container with env variables
   db:
     image: postgres:9.6
     restart: always
@@ -13,6 +14,7 @@ services:
       - pgdata:/var/lib/PostgreSQL/data
       - ./db.sh:/docker-entrypoint-initdb.d/create_extensions.sh
 
+#Elasticsearch Container
   elasticsearch:
     restart: always
     image: docker.elastic.co/elasticsearch/elasticsearch:7.5.2
@@ -23,6 +25,7 @@ services:
     volumes:
       - esdata:/var/lib/elasticsearch/data
 
+#Graphspace Image with enviornment variables 
   graphspace:
     restart: always
     image: maheshkasbe/graphspace:latest
diff --git a/install.sh b/install.sh
index 50b4ac2f..72d9858b 100644
--- a/install.sh
+++ b/install.sh
@@ -3,5 +3,6 @@
 python setup.py install
 python manage.py migrate --settings=graphspace.settings.local
 bower install
+#Temporary & forced fix untill all the libraries get updated
 bower install bootstrap#3.3.7
 bower install bootstrap-table#1.11.0
\ No newline at end of file

From 7ca29189eac33f9f6054a32cdf0e508cd12eeec5 Mon Sep 17 00:00:00 2001
From: Mahesh <maheshkasbe010@gmail.com>
Date: Sat, 5 Aug 2023 21:51:48 +0530
Subject: [PATCH 18/20] Added some more comments

Signed-off-by: Mahesh <maheshkasbe010@gmail.com>
---
 .github/workflows/Image_scan.yaml     | 2 +-
 .github/workflows/assign_pr.yaml      | 2 +-
 .github/workflows/branch_labeler.yaml | 2 +-
 .github/workflows/ci-graphspace.yaml  | 2 +-
 .github/workflows/deploy.yaml         | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/Image_scan.yaml b/.github/workflows/Image_scan.yaml
index 779005b2..ce7d6ed7 100644
--- a/.github/workflows/Image_scan.yaml
+++ b/.github/workflows/Image_scan.yaml
@@ -1,6 +1,6 @@
 name: Trivy Docker Image Scan 
 
-on: [push, pull_request]
+on: [push, pull_request] # Runs when the someone pushes changes to branch or creates a pull request
 
 jobs:
   build:
diff --git a/.github/workflows/assign_pr.yaml b/.github/workflows/assign_pr.yaml
index 5e2231ba..8d37872b 100644
--- a/.github/workflows/assign_pr.yaml
+++ b/.github/workflows/assign_pr.yaml
@@ -1,7 +1,7 @@
 name: 'Auto Assign'
 on:
   pull_request_target:
-    types: [opened, ready_for_review]
+    types: [opened, ready_for_review] # Runs when the someone opens a pull request
 
 jobs:
   add-reviews:
diff --git a/.github/workflows/branch_labeler.yaml b/.github/workflows/branch_labeler.yaml
index a75b25de..6f533631 100644
--- a/.github/workflows/branch_labeler.yaml
+++ b/.github/workflows/branch_labeler.yaml
@@ -1,5 +1,5 @@
 name: PR Labeler
-on: pull_request_target
+on: pull_request_target # Runs when the someone creates a pull request
 
 permissions:
   contents: read
diff --git a/.github/workflows/ci-graphspace.yaml b/.github/workflows/ci-graphspace.yaml
index 763e18a3..cae200b2 100644
--- a/.github/workflows/ci-graphspace.yaml
+++ b/.github/workflows/ci-graphspace.yaml
@@ -1,6 +1,6 @@
 name: Docker Build & Push Graphspace
 
-on: [push, pull_request]
+on: [push, pull_request] # Runs when the someone pushes changes to branch or creates a pull request
 
 jobs:
 
diff --git a/.github/workflows/deploy.yaml b/.github/workflows/deploy.yaml
index 40ffba64..665cfe73 100644
--- a/.github/workflows/deploy.yaml
+++ b/.github/workflows/deploy.yaml
@@ -1,6 +1,6 @@
 name: Push to ECR
 
-on: [push, pull_request]
+on: [push, pull_request] # Runs when the someone pushes changes to branch or creates a pull request
 
 jobs:
    deploy:

From 4f4cb0f2936371559cfe009efdbb117ffe6ca36d Mon Sep 17 00:00:00 2001
From: Mahesh <maheshkasbe010@gmail.com>
Date: Sun, 6 Aug 2023 21:23:31 +0530
Subject: [PATCH 19/20] added a actions-pipeline inside pr-labeler.yml

---
 .github/pr-labeler.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/pr-labeler.yml b/.github/pr-labeler.yml
index 9c4df5e4..e8e2a265 100644
--- a/.github/pr-labeler.yml
+++ b/.github/pr-labeler.yml
@@ -1,3 +1,4 @@
 feature: ['feature/*', 'feat/*']
 fix: fix/*
-chore: chore/*
\ No newline at end of file
+chore: chore/*
+actions-pipeline: actions-pipeline/*
\ No newline at end of file

From 55c98122f85eb4f7490785517680f94f74aae00d Mon Sep 17 00:00:00 2001
From: Mahesh <maheshkasbe010@gmail.com>
Date: Sun, 6 Aug 2023 22:57:43 +0530
Subject: [PATCH 20/20] Renamed workflow

---
 .github/workflows/{branch_labeler.yaml => pr_labeler.yaml} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename .github/workflows/{branch_labeler.yaml => pr_labeler.yaml} (100%)

diff --git a/.github/workflows/branch_labeler.yaml b/.github/workflows/pr_labeler.yaml
similarity index 100%
rename from .github/workflows/branch_labeler.yaml
rename to .github/workflows/pr_labeler.yaml