Merge pull request #33 from topoteretes/feature/test_deployment_of_do…

…cker Build the docker and push
topoteretes · Jan 23, 2024 · e189213 · e189213
2 parents e3f3633 + dab514f
commit e189213
Show file tree

Hide file tree

Showing 85 changed files with 4,331 additions and 3,112 deletions.
diff --git a/...-izrade-i-nacin-vrsenja-kontrole-tehnicke-dokumentacije-prema-klasi-i-nameni-objekata.pdf b/...-izrade-i-nacin-vrsenja-kontrole-tehnicke-dokumentacije-prema-klasi-i-nameni-objekata.pdf
diff --git a/.data/Pravilnik-o-energetskoj-efikasnosti-zgrada.pdf b/.data/Pravilnik-o-energetskoj-efikasnosti-zgrada.pdf
diff --git a/.data/Pravilnik-o-izgledu-sadrzini-i-mestu-postavljanja-gradilisne-table.pdf b/.data/Pravilnik-o-izgledu-sadrzini-i-mestu-postavljanja-gradilisne-table.pdf
diff --git a/.data/Pravilnik-o-katastarskom-premeru-i-katastru-nepokretnosti.pdf b/.data/Pravilnik-o-katastarskom-premeru-i-katastru-nepokretnosti.pdf
diff --git a/.data/Pravilnik-o-nacinu-zatvaranja-i-obelezavanju-zatvorenog-gradilista.pdf b/.data/Pravilnik-o-nacinu-zatvaranja-i-obelezavanju-zatvorenog-gradilista.pdf
diff --git a/...o-objektima-na-koje-se-ne-primenjuju-pojedine-odredbe-Zakona-o-planiranju-i-izgradnji.pdf b/...o-objektima-na-koje-se-ne-primenjuju-pojedine-odredbe-Zakona-o-planiranju-i-izgradnji.pdf
diff --git a/.data/Pravilnik-o-postupku-sprovodjenja-objedinjene-1.pdf b/.data/Pravilnik-o-postupku-sprovodjenja-objedinjene-1.pdf
diff --git a/.data/Pravilnik-o-sadrzini-i-nacinu-vrsenja-tehnickog-pregleda-objekta.pdf b/.data/Pravilnik-o-sadrzini-i-nacinu-vrsenja-tehnickog-pregleda-objekta.pdf
diff --git a/...e-i-nacinu-vrsenja-kontrole-tehnicke-dokumentacije-prema-klasi-i-nameni-objekata-2018.pdf b/...e-i-nacinu-vrsenja-kontrole-tehnicke-dokumentacije-prema-klasi-i-nameni-objekata-2018.pdf
diff --git a/...k-o-sadrzini-postupku-i-nacinu-donosenja-programa-uredjivanja-gradjevinskog-zemljista.pdf b/...k-o-sadrzini-postupku-i-nacinu-donosenja-programa-uredjivanja-gradjevinskog-zemljista.pdf
diff --git a/.data/Pravilnik-o-uslovima-i-normativima-za-projektovanje-stambenih-zgrada-i-stanova.pdf b/.data/Pravilnik-o-uslovima-i-normativima-za-projektovanje-stambenih-zgrada-i-stanova.pdf
diff --git a/.data/Pravilnik-o-uslovima-osiguranja-od-profesionalne-odgovornosti.pdf b/.data/Pravilnik-o-uslovima-osiguranja-od-profesionalne-odgovornosti.pdf
diff --git a/...ik-o-uslovima-sadrzini-i-nacinu-izdavanja-sertifikata-o-energetskim-svojstvima-zgrada.pdf b/...ik-o-uslovima-sadrzini-i-nacinu-izdavanja-sertifikata-o-energetskim-svojstvima-zgrada.pdf
diff --git a/level_4/.env.template → .env.template b/level_4/.env.template → .env.template
@@ -1,14 +1,18 @@
 OPENAI_API_KEY=sk
 WEAVIATE_URL =
 WEAVIATE_API_KEY =
-ENVIRONMENT = docker
+ENV = docker
 POSTGRES_USER = bla
 POSTGRES_PASSWORD = bla
 POSTGRES_DB = bubu
 POSTGRES_HOST = localhost
 POSTGRES_HOST_DOCKER = postgres
 SEGMENT_KEY = Etl4WJwzOkeDPAjaOXOMgyU16hO7mV7B
 COG_ARCH_DIR = cognitive_architecture
-    GRAPH_DB_URL =
-    GRAPH_DB_PW =
-    GRAPH_DB_USER =
+GRAPH_DB_URL =
+GRAPH_DB_PW =
+GRAPH_DB_USER =
+AWS_ACCESS_KEY_ID =
+AWS_SECRET_ACCESS_KEY =
+QDRANT_API_KEY
+QDRANT_API_URL
diff --git a/.github/actions/image_builder/action.yaml b/.github/actions/image_builder/action.yaml
@@ -33,4 +33,3 @@ runs:
         image_name="${{ inputs.ecr_image_repo_name }}" docker_login="true" version="$VERSION" account="${{ inputs.aws_account_id }}" app_dir="$APP_DIR" publish="${{ inputs.should_publish }}" ./bin/dockerize
         echo "Docker tag is: $VERSION"
         echo $VERSION > /tmp/.DOCKER_IMAGE_VERSION
-  
diff --git a/.github/workflows/cd.yaml b/.github/workflows/cd.yaml
@@ -47,8 +47,8 @@ jobs:
           stage: dev
           aws_account_id: ${{ env.AWS_ACCOUNT_ID_DEV }}
           should_publish: true
-          ecr_image_repo_name: promethai-dev-backend-promethai-backend-memory
-          dockerfile_location: level_2/.
+          ecr_image_repo_name: promethai-dev-backend-promethai-backend
+          dockerfile_location: ./
       - name: Export Docker image tag
         id: export-promethai-docker-tag
         run: |
@@ -58,19 +58,19 @@ jobs:
     outputs:
       promethai_docker_tag_backend: ${{ steps.export-promethai-docker-tag.outputs.promethai_docker_tag_backend }}
 
-#  apply_tf:
-#    name: Trigger terraform apply workflow
-#    runs-on: ubuntu-latest
-#    needs: publish_docker_to_ecr
-#    steps:
-#      - name: TF apply workflow triggers step
-#        uses: actions/github-script@v6
-#        with:
-#          github-token: ${{ secrets.PAT_FOR_CROSS_REPOS_CICD_TRIGGERING }}
-#          script: |
-#            await github.rest.actions.createWorkflowDispatch({
-#              owner: 'topoteretes',
-#              repo: 'PromethAI-Infra',
-#              workflow_id: 'terraform.apply.yml',
-#              ref: 'main'
-#            })
+  apply_tf:
+    name: Trigger terraform apply workflow
+    runs-on: ubuntu-latest
+    needs: publish_docker_to_ecr
+    steps:
+      - name: TF apply workflow triggers step
+        uses: actions/github-script@v6
+        with:
+          github-token: ${{ secrets.PAT_FOR_CROSS_REPOS_CICD_TRIGGERING }}
+          script: |
+            await github.rest.actions.createWorkflowDispatch({
+              owner: 'topoteretes',
+              repo: 'PromethAI-Infra',
+              workflow_id: 'terraform.apply.yml',
+              ref: 'main'
+            })
diff --git a/.github/workflows/cd_prd.yaml b/.github/workflows/cd_prd.yaml
@@ -23,38 +23,38 @@ jobs:
     steps:
       - name: Take code from repo
         uses: actions/checkout@v3
-#      - name: Set environment variable for stage
-#        id: set-env
-#        run: |
-#          if [[ "${{ github.ref }}" == "refs/heads/main" ]]; then
-#            echo "STAGE=prd" >> $GITHUB_ENV
-#            echo "::set-output name=stage::prd"
-#          else
-#            echo "STAGE=dev" >> $GITHUB_ENV
-#            echo "::set-output name=stage::dev"
-#          fi
-#      - name: Use output
-#        run: echo "The stage is ${{ steps.set-env.outputs.stage }}"
-#      - name: Configure AWS credentials
-#        uses: aws-actions/configure-aws-credentials@v1
-#        with:
-#          role-to-assume: ${{ env.AWS_ROLE_DEV_CICD }}
-#          aws-region: eu-west-1
-#      - name: Create Docker image and push to ECR
-#        uses: ./.github/actions/image_builder
-#        id: generate-promethai-docker
-#        with:
-#          stage: prd
-#          aws_account_id: ${{ env.AWS_ACCOUNT_ID_DEV }}
-#          should_publish: true
-#          ecr_image_repo_name: promethai-prd-backend-promethai-backend-memory
-#          dockerfile_location: ./level_2
-#      - name: Export Docker image tag
-#        id: export-promethai-docker-tag
-#        run: |
-#          export DOCKER_TAG=$(cat /tmp/.DOCKER_IMAGE_VERSION)
-#          echo "Docker tag is: $DOCKER_TAG"
-#          echo "promethai_docker_tag_backend=$DOCKER_TAG" >> $GITHUB_OUTPUT
+      - name: Set environment variable for stage
+        id: set-env
+        run: |
+          if [[ "${{ github.ref }}" == "refs/heads/main" ]]; then
+            echo "STAGE=prd" >> $GITHUB_ENV
+            echo "::set-output name=stage::prd"
+          else
+            echo "STAGE=dev" >> $GITHUB_ENV
+            echo "::set-output name=stage::dev"
+          fi
+      - name: Use output
+        run: echo "The stage is ${{ steps.set-env.outputs.stage }}"
+      - name: Configure AWS credentials
+        uses: aws-actions/configure-aws-credentials@v1
+        with:
+          role-to-assume: ${{ env.AWS_ROLE_DEV_CICD }}
+          aws-region: eu-west-1
+      - name: Create Docker image and push to ECR
+        uses: ./.github/actions/image_builder
+        id: generate-promethai-docker
+        with:
+          stage: prd
+          aws_account_id: ${{ env.AWS_ACCOUNT_ID_DEV }}
+          should_publish: true
+          ecr_image_repo_name: promethai-prd-backend-promethai-backend
+          dockerfile_location: ./
+      - name: Export Docker image tag
+        id: export-promethai-docker-tag
+        run: |
+          export DOCKER_TAG=$(cat /tmp/.DOCKER_IMAGE_VERSION)
+          echo "Docker tag is: $DOCKER_TAG"
+          echo "promethai_docker_tag_backend=$DOCKER_TAG" >> $GITHUB_OUTPUT
 
 #      - name: Create Tag and Release
 #        runs-on: ubuntu-latest
@@ -78,22 +78,22 @@ jobs:
 #            with:
 #              tag_name: ${{ steps.bump_version_and_push_tag.outputs.tag }}
 #              release_name: Release ${{ steps.bump_version_and_push_tag.outputs.tag }}
-#    outputs:
-#      promethai_docker_tag_backend: ${{ steps.export-promethai-docker-tag.outputs.promethai_docker_tag_backend }}
+    outputs:
+      promethai_docker_tag_backend: ${{ steps.export-promethai-docker-tag.outputs.promethai_docker_tag_backend }}
 
-#  apply_tf:
-#    name: Trigger terraform apply workflow
-#    runs-on: ubuntu-latest
-#    needs: publish_docker_to_ecr
-#    steps:
-#      - name: TF apply workflow triggers step
-#        uses: actions/github-script@v6
-#        with:
-#          github-token: ${{ secrets.PAT_FOR_CROSS_REPOS_CICD_TRIGGERING }}
-#          script: |
-#            await github.rest.actions.createWorkflowDispatch({
-#              owner: 'topoteretes',
-#              repo: 'PromethAI-Infra',
-#              workflow_id: 'terraform.apply.yml',
-#              ref: 'main'
-#            })
+  apply_tf:
+    name: Trigger terraform apply workflow
+    runs-on: ubuntu-latest
+    needs: publish_docker_to_ecr
+    steps:
+      - name: TF apply workflow triggers step
+        uses: actions/github-script@v6
+        with:
+          github-token: ${{ secrets.PAT_FOR_CROSS_REPOS_CICD_TRIGGERING }}
+          script: |
+            await github.rest.actions.createWorkflowDispatch({
+              owner: 'topoteretes',
+              repo: 'PromethAI-Infra',
+              workflow_id: 'terraform.apply.yml',
+              ref: 'main'
+            })
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -20,6 +20,6 @@ jobs:
           export SHA_SHORT="$(git rev-parse --short HEAD)"
           export CUR_DATE="$(date +%Y%m%d%H%M%S)"
           export VERSION="dev-$CUR_DATE-$SHA_SHORT"
-          image_name="backend-memory" docker_login="false" version="$VERSION" account="${{ env.AWS_ACCOUNT_ID_DEV }}" app_dir="level_2" publish="false" ./bin/dockerize
-          export DOCKER_TAG=$(cat level_2/tmp/.DOCKER_IMAGE_VERSION)
+          image_name="backend" docker_login="false" version="$VERSION" account="${{ env.AWS_ACCOUNT_ID_DEV }}" app_dir="backend" publish="false" ./bin/dockerize
+          export DOCKER_TAG=$(cat /tmp/.DOCKER_IMAGE_VERSION)
           echo "Successfully built PromethAI backend Docker tag is: $DOCKER_TAG"
diff --git a/level_4/CONTRIBUTING.md → CONTRIBUTING.md b/level_4/CONTRIBUTING.md → CONTRIBUTING.md
diff --git a/level_4/Dockerfile → Dockerfile b/level_4/Dockerfile → Dockerfile
@@ -24,6 +24,7 @@ RUN apt-get update -q && \
         curl \
         zip \
         jq \
+#        libgl1-mesa-glx \
         netcat-traditional && \
     pip install poetry && \
     curl "https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip" -o "awscliv2.zip" && \
Original file line number	Diff line number	Diff line change
Expand Up		@@ -33,4 +33,3 @@ runs:
		image_name="${{ inputs.ecr_image_repo_name }}" docker_login="true" version="$VERSION" account="${{ inputs.aws_account_id }}" app_dir="$APP_DIR" publish="${{ inputs.should_publish }}" ./bin/dockerize
		echo "Docker tag is: $VERSION"
		echo $VERSION > /tmp/.DOCKER_IMAGE_VERSION