From c33c0084a3b6c583ebd923217c1c2ca4ee61078f Mon Sep 17 00:00:00 2001 From: Sudeep Ratnaparkhe Date: Fri, 15 Mar 2024 12:26:42 +0530 Subject: [PATCH 01/22] added docker compose file --- docker-compose.yml | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 docker-compose.yml diff --git a/docker-compose.yml b/docker-compose.yml new file mode 100644 index 0000000..36414b1 --- /dev/null +++ b/docker-compose.yml @@ -0,0 +1,19 @@ +version: '3' +services: + content-service-app: + build: + context: . + ports: + - '3008:3008' + container_name: content-service + restart: always + networks: + - ai-network + environment: + - MONGODB_URL= + - ALL_LC_API_URL= + - SERVER_URL= + +networks: + ai-network: + driver: bridge From cad92c95e6010cc3d3f9159d85ed0eca2ef07200 Mon Sep 17 00:00:00 2001 From: prasadharke-tekdi <131845849+prasadharke-tekdi@users.noreply.github.com> Date: Fri, 15 Mar 2024 12:38:05 +0530 Subject: [PATCH 02/22] Create Dev.yml --- .github/workflows /Dev.yml | 62 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 62 insertions(+) create mode 100644 .github/workflows /Dev.yml diff --git a/.github/workflows /Dev.yml b/.github/workflows /Dev.yml new file mode 100644 index 0000000..6266410 --- /dev/null +++ b/.github/workflows /Dev.yml @@ -0,0 +1,62 @@ +name: DEV DEPLOYMENT + +on: + push: + branches: [ ] + +jobs: + build: + runs-on: ubuntu-latest + steps: + - + name: Checkout + uses: actions/checkout@v2 + - + name: Login to DockerHub + uses: docker/login-action@v1 + with: + username: ${{ secrets.DOCKERHUB_USERNAME }} + password: ${{ secrets.DOCKERHUB_TOKEN }} + + - + name: Load .env from GitHub Secret + run: echo "${{ secrets.MY_ENV_VARS }}" > .env + + - + name: Build and push + uses: docker/build-push-action@v2 + with: + context: . + push: true + tags: ${{ secrets.CONTAINER_REGISTRY }}:${{ secrets.IMAGE_TAG }} + env: + MY_ENV_VARS: ${{ secrets.MY_ENV_VARS }} + deploy: + runs-on: ubuntu-latest + timeout-minutes: 15 + needs: [build] + steps: + - + name: Checkout + uses: actions/checkout@v2 + - + name: Deploy Stack + uses: appleboy/ssh-action@master + with: + host: ${{ secrets.HOST }} + username: ${{ secrets.USERNAME }} + key: ${{ secrets.DOCKER_SSH_PRIVATE_KEY }} + port: ${{ secrets.PORT }} + script: | + + docker login + + docker container stop ${{ secrets.CONTAINER_NAME }} + + docker rm ${{ secrets.CONTAINER_NAME }} + + docker rmi ${{ secrets.CONTAINER_REGISTRY }}:${{ secrets.IMAGE_TAG }} + + docker pull ${{ secrets.CONTAINER_REGISTRY }}:${{ secrets.IMAGE_TAG }} + + docker-compose up -d --force-recreate --no-deps From ffe4b5e738ece1cf9c0d081be61e46e5f798bb68 Mon Sep 17 00:00:00 2001 From: prasadharke-tekdi <131845849+prasadharke-tekdi@users.noreply.github.com> Date: Fri, 15 Mar 2024 13:10:07 +0530 Subject: [PATCH 03/22] Update Dev.yml --- .github/workflows /Dev.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows /Dev.yml b/.github/workflows /Dev.yml index 6266410..4b64719 100644 --- a/.github/workflows /Dev.yml +++ b/.github/workflows /Dev.yml @@ -2,7 +2,7 @@ name: DEV DEPLOYMENT on: push: - branches: [ ] + branches: [ all-1.0 ] jobs: build: From 2cf195e6cdc272663d84e9ff178a3e1f713cd577 Mon Sep 17 00:00:00 2001 From: prasadharke-tekdi <131845849+prasadharke-tekdi@users.noreply.github.com> Date: Fri, 15 Mar 2024 13:12:03 +0530 Subject: [PATCH 04/22] Rename Dev.yml to Dev.yml --- .github/{workflows => workflows}/Dev.yml | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename .github/{workflows => workflows}/Dev.yml (100%) diff --git a/.github/workflows /Dev.yml b/.github/workflows/Dev.yml similarity index 100% rename from .github/workflows /Dev.yml rename to .github/workflows/Dev.yml From 85b16b8a01f28f5032617d1ce74812d5e4e015af Mon Sep 17 00:00:00 2001 From: prasadharke-tekdi <131845849+prasadharke-tekdi@users.noreply.github.com> Date: Fri, 15 Mar 2024 13:18:41 +0530 Subject: [PATCH 05/22] Update Dev.yml --- .github/workflows/Dev.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/Dev.yml b/.github/workflows/Dev.yml index 4b64719..fe3a6c8 100644 --- a/.github/workflows/Dev.yml +++ b/.github/workflows/Dev.yml @@ -45,7 +45,7 @@ jobs: with: host: ${{ secrets.HOST }} username: ${{ secrets.USERNAME }} - key: ${{ secrets.DOCKER_SSH_PRIVATE_KEY }} + key: ${{ secrets.SSH_PRIVATE_KEY }} port: ${{ secrets.PORT }} script: | From 3714b7fe996506c1c75f645eeaf66956ed6ed0b0 Mon Sep 17 00:00:00 2001 From: prasadharke-tekdi <131845849+prasadharke-tekdi@users.noreply.github.com> Date: Fri, 15 Mar 2024 13:30:01 +0530 Subject: [PATCH 06/22] Update and rename dockerfile to Dockerfile --- dockerfile => Dockerfile | 1 + 1 file changed, 1 insertion(+) rename dockerfile => Dockerfile (97%) diff --git a/dockerfile b/Dockerfile similarity index 97% rename from dockerfile rename to Dockerfile index 0aa8482..ed867e3 100644 --- a/dockerfile +++ b/Dockerfile @@ -12,6 +12,7 @@ RUN npm install # Copy the rest of the application code to the container COPY . . +COPY .env # Set environment variables ENV PORT=3008 From f71ecbe0a4fb958fbd6bce630f069e9f941fb3db Mon Sep 17 00:00:00 2001 From: prasadharke-tekdi <131845849+prasadharke-tekdi@users.noreply.github.com> Date: Fri, 15 Mar 2024 13:31:03 +0530 Subject: [PATCH 07/22] Update docker-compose.yml --- docker-compose.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 36414b1..bfe8cb7 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -10,9 +10,7 @@ services: networks: - ai-network environment: - - MONGODB_URL= - - ALL_LC_API_URL= - - SERVER_URL= + - .env networks: ai-network: From 87719ec6be6d05d01670aee1a6dc8fa1ede5efc6 Mon Sep 17 00:00:00 2001 From: prasadharke-tekdi <131845849+prasadharke-tekdi@users.noreply.github.com> Date: Fri, 15 Mar 2024 13:36:19 +0530 Subject: [PATCH 08/22] Update Dockerfile --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index ed867e3..ad706ba 100644 --- a/Dockerfile +++ b/Dockerfile @@ -12,7 +12,7 @@ RUN npm install # Copy the rest of the application code to the container COPY . . -COPY .env +COPY .env ./ # Set environment variables ENV PORT=3008 From 91217791eb33b5eb4804fddc9a6b45461cd707d5 Mon Sep 17 00:00:00 2001 From: prasadharke-tekdi <131845849+prasadharke-tekdi@users.noreply.github.com> Date: Fri, 15 Mar 2024 13:58:02 +0530 Subject: [PATCH 09/22] Update Dev.yml --- .github/workflows/Dev.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/Dev.yml b/.github/workflows/Dev.yml index fe3a6c8..5d5eeac 100644 --- a/.github/workflows/Dev.yml +++ b/.github/workflows/Dev.yml @@ -59,4 +59,4 @@ jobs: docker pull ${{ secrets.CONTAINER_REGISTRY }}:${{ secrets.IMAGE_TAG }} - docker-compose up -d --force-recreate --no-deps + docker run -d --name ${{ secrets.CONTAINER_NAME }} --network ${{ secrets.NETWORK }} -p ${{ secrets.CONTAINER_PORT }} -t ${{ secrets.CONTAINER_REGISTRY }}:${{ secrets.IMAGE_TAG }} From 8a2984ca941fa4f43e4336fe185b7ae5a10a3ea1 Mon Sep 17 00:00:00 2001 From: prasadharke-tekdi <131845849+prasadharke-tekdi@users.noreply.github.com> Date: Fri, 15 Mar 2024 17:32:54 +0530 Subject: [PATCH 10/22] Update Dockerfile --- Dockerfile | 1 - 1 file changed, 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index ad706ba..0aa8482 100644 --- a/Dockerfile +++ b/Dockerfile @@ -12,7 +12,6 @@ RUN npm install # Copy the rest of the application code to the container COPY . . -COPY .env ./ # Set environment variables ENV PORT=3008 From 56f6d2432973cedecca7f06a1f0d31bfcf2e093f Mon Sep 17 00:00:00 2001 From: prasadharke-tekdi <131845849+prasadharke-tekdi@users.noreply.github.com> Date: Fri, 15 Mar 2024 18:46:57 +0530 Subject: [PATCH 11/22] Update Dockerfile --- Dockerfile | 5 ----- 1 file changed, 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index 0aa8482..b84a7a7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -13,11 +13,6 @@ RUN npm install # Copy the rest of the application code to the container COPY . . -# Set environment variables -ENV PORT=3008 -ENV MONGO_URL= -ENV ALL_LC_API_URL= - # Expose the port on which the application will run EXPOSE $PORT From 6ff12e0e3447a068a0f0b32523320f9f5b801d6a Mon Sep 17 00:00:00 2001 From: prasadharke-tekdi <131845849+prasadharke-tekdi@users.noreply.github.com> Date: Mon, 18 Mar 2024 17:40:37 +0530 Subject: [PATCH 12/22] Create Prod.yml --- .github/workflows/Prod.yml | 62 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 62 insertions(+) create mode 100644 .github/workflows/Prod.yml diff --git a/.github/workflows/Prod.yml b/.github/workflows/Prod.yml new file mode 100644 index 0000000..fa87ea0 --- /dev/null +++ b/.github/workflows/Prod.yml @@ -0,0 +1,62 @@ +name: DEV DEPLOYMENT + +on: + push: + branches: [ all-1.0-prod ] + +jobs: + build: + runs-on: ubuntu-latest + steps: + - + name: Checkout + uses: actions/checkout@v2 + - + name: Login to DockerHub + uses: docker/login-action@v1 + with: + username: ${{ secrets.DOCKERHUB_USERNAME }} + password: ${{ secrets.DOCKERHUB_TOKEN }} + + - + name: Load .env from GitHub Secret + run: echo "${{ secrets.MY_ENV_VARS_PROD }}" > .env + + - + name: Build and push + uses: docker/build-push-action@v2 + with: + context: . + push: true + tags: ${{ secrets.CONTAINER_REGISTRY_PROD }}:${{ secrets.IMAGE_TAG }} + env: + MY_ENV_VARS: ${{ secrets.MY_ENV_VARS_PROD }} + deploy: + runs-on: ubuntu-latest + timeout-minutes: 15 + needs: [build] + steps: + - + name: Checkout + uses: actions/checkout@v2 + - + name: Deploy Stack + uses: appleboy/ssh-action@master + with: + host: ${{ secrets.HOST_PROD }} + username: ${{ secrets.USERNAME_PROD }} + key: ${{ secrets.SSH_PRIVATE_KEY_PROD }} + port: ${{ secrets.PORT }} + script: | + + docker login + + docker container stop ${{ secrets.CONTAINER_NAME }} + + docker rm ${{ secrets.CONTAINER_NAME }} + + docker rmi ${{ secrets.CONTAINER_REGISTRY_PROD }}:${{ secrets.IMAGE_TAG }} + + docker pull ${{ secrets.CONTAINER_REGISTRY_PROD }}:${{ secrets.IMAGE_TAG }} + + docker run -d --name ${{ secrets.CONTAINER_NAME }} --network ${{ secrets.NETWORK }} -p ${{ secrets.CONTAINER_PORT }} -t ${{ secrets.CONTAINER_REGISTRY_PROD }}:${{ secrets.IMAGE_TAG }} From 01fcd065487ff9e86b7a964f89e129476a2028fb Mon Sep 17 00:00:00 2001 From: prasadharke-tekdi <131845849+prasadharke-tekdi@users.noreply.github.com> Date: Mon, 18 Mar 2024 17:41:09 +0530 Subject: [PATCH 13/22] Create Prod.yml --- .github/workflows/Prod.yml | 62 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 62 insertions(+) create mode 100644 .github/workflows/Prod.yml diff --git a/.github/workflows/Prod.yml b/.github/workflows/Prod.yml new file mode 100644 index 0000000..fa87ea0 --- /dev/null +++ b/.github/workflows/Prod.yml @@ -0,0 +1,62 @@ +name: DEV DEPLOYMENT + +on: + push: + branches: [ all-1.0-prod ] + +jobs: + build: + runs-on: ubuntu-latest + steps: + - + name: Checkout + uses: actions/checkout@v2 + - + name: Login to DockerHub + uses: docker/login-action@v1 + with: + username: ${{ secrets.DOCKERHUB_USERNAME }} + password: ${{ secrets.DOCKERHUB_TOKEN }} + + - + name: Load .env from GitHub Secret + run: echo "${{ secrets.MY_ENV_VARS_PROD }}" > .env + + - + name: Build and push + uses: docker/build-push-action@v2 + with: + context: . + push: true + tags: ${{ secrets.CONTAINER_REGISTRY_PROD }}:${{ secrets.IMAGE_TAG }} + env: + MY_ENV_VARS: ${{ secrets.MY_ENV_VARS_PROD }} + deploy: + runs-on: ubuntu-latest + timeout-minutes: 15 + needs: [build] + steps: + - + name: Checkout + uses: actions/checkout@v2 + - + name: Deploy Stack + uses: appleboy/ssh-action@master + with: + host: ${{ secrets.HOST_PROD }} + username: ${{ secrets.USERNAME_PROD }} + key: ${{ secrets.SSH_PRIVATE_KEY_PROD }} + port: ${{ secrets.PORT }} + script: | + + docker login + + docker container stop ${{ secrets.CONTAINER_NAME }} + + docker rm ${{ secrets.CONTAINER_NAME }} + + docker rmi ${{ secrets.CONTAINER_REGISTRY_PROD }}:${{ secrets.IMAGE_TAG }} + + docker pull ${{ secrets.CONTAINER_REGISTRY_PROD }}:${{ secrets.IMAGE_TAG }} + + docker run -d --name ${{ secrets.CONTAINER_NAME }} --network ${{ secrets.NETWORK }} -p ${{ secrets.CONTAINER_PORT }} -t ${{ secrets.CONTAINER_REGISTRY_PROD }}:${{ secrets.IMAGE_TAG }} From 17eae19d28af293bda3934d1ce7ea521d0a7dbee Mon Sep 17 00:00:00 2001 From: prasadharke-tekdi <131845849+prasadharke-tekdi@users.noreply.github.com> Date: Mon, 18 Mar 2024 18:15:06 +0530 Subject: [PATCH 14/22] Update Prod.yml --- .github/workflows/Prod.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/Prod.yml b/.github/workflows/Prod.yml index fa87ea0..6d16f61 100644 --- a/.github/workflows/Prod.yml +++ b/.github/workflows/Prod.yml @@ -1,4 +1,4 @@ -name: DEV DEPLOYMENT +name: PROD DEPLOYMENT on: push: From cb4b5ec0d2bde48590dd26d015077d13f4a63283 Mon Sep 17 00:00:00 2001 From: Sudeep Ratnaparkhe Date: Thu, 4 Apr 2024 23:13:52 +0530 Subject: [PATCH 15/22] Indic language content syllable count not unique logic updated --- package.json | 1 + src/controllers/content.controller.ts | 17 ++++++++++++++++- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index dab173c..69321f7 100644 --- a/package.json +++ b/package.json @@ -40,6 +40,7 @@ "mongoose": "^7.3.2", "reflect-metadata": "^0.1.13", "rxjs": "^7.8.1", + "split-graphemes": "^0.5.0", "uuid": "^9.0.0" }, "devDependencies": { diff --git a/src/controllers/content.controller.ts b/src/controllers/content.controller.ts index 8747fd7..b9fd3d3 100644 --- a/src/controllers/content.controller.ts +++ b/src/controllers/content.controller.ts @@ -6,6 +6,7 @@ import { FastifyReply } from 'fastify'; import { HttpService } from "@nestjs/axios"; import { firstValueFrom, lastValueFrom, map } from "rxjs"; import { ApiBody, ApiExcludeEndpoint, ApiForbiddenResponse, ApiOperation, ApiParam, ApiResponse, ApiTags } from '@nestjs/swagger'; +import * as splitGraphemes from 'split-graphemes'; @ApiTags('content') @Controller('content') @@ -60,10 +61,24 @@ export class contentController { delete newContent.result.meanWordComplexity; delete newContent.result.totalWordComplexity; delete newContent.result.wordComplexityMap; + delete newContent.result.syllableCount; + delete newContent.result.syllableCountMap; + + async function getSyllableCount(text) { + return splitGraphemes.splitGraphemes(text.replace(/[\u200B\u200C\u200D\uFEFF\s!@#$%^&*()_+{}\[\]:;<>,.?\/\\|~'"-=]/g, '')).length; + } + + let syllableCount = await getSyllableCount(contentSourceDataEle['text']); + + let syllableCountMap = {} + + for (let wordEle of contentSourceDataEle['text'].split(" ")) { + syllableCountMap[wordEle] = await getSyllableCount(wordEle); + } newContent.result.wordMeasures = newWordMeasures; - return { ...contentSourceDataEle, ...newContent.result }; + return { ...contentSourceDataEle, ...newContent.result, syllableCount: syllableCount, syllableCountMap: syllableCountMap }; } else if (contentSourceDataEle['language'] === "en") { const url = process.env.ALL_TEXT_EVAL_URL + 'getPhonemes'; From f297702b3d1705d98b93abeb3f3225b7fef459d2 Mon Sep 17 00:00:00 2001 From: Sudeep Ratnaparkhe Date: Fri, 5 Apr 2024 18:17:15 +0530 Subject: [PATCH 16/22] add syllable count in pagination api --- src/controllers/content.controller.ts | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/src/controllers/content.controller.ts b/src/controllers/content.controller.ts index b9fd3d3..2edd436 100644 --- a/src/controllers/content.controller.ts +++ b/src/controllers/content.controller.ts @@ -202,7 +202,20 @@ export class contentController { try { const skip = (page - 1) * limit; const { data } = await this.contentService.pagination(skip, limit, type, collectionId); - return response.status(HttpStatus.OK).send({ status: 'success', data }); + + let language = data[0].language; + + let totalSyllableCount = 0; + if (language === "en") { + data.forEach((contentObject: any) => { + totalSyllableCount += contentObject.contentSourceData[0].phonemes.length; + }); + } else { + data.forEach((contentObject: any) => { + totalSyllableCount += contentObject.contentSourceData[0].syllableCount; + }); + } + return response.status(HttpStatus.OK).send({ status: 'success', data, totalSyllableCount: totalSyllableCount }); } catch (error) { return response.status(HttpStatus.INTERNAL_SERVER_ERROR).send({ status: "error", From 577d767f7b414bb44c7bde04092f90b67d732938 Mon Sep 17 00:00:00 2001 From: prasadharke-tekdi <131845849+prasadharke-tekdi@users.noreply.github.com> Date: Tue, 23 Apr 2024 10:15:45 +0530 Subject: [PATCH 17/22] Update Prod.yml --- .github/workflows/Prod.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/Prod.yml b/.github/workflows/Prod.yml index 526b9f4..0586e26 100644 --- a/.github/workflows/Prod.yml +++ b/.github/workflows/Prod.yml @@ -59,4 +59,4 @@ jobs: docker pull ${{ secrets.CONTAINER_REGISTRY_PROD }}:${{ secrets.IMAGE_TAG }} - docker run -d --name ${{ secrets.CONTAINER_NAME }} --network ${{ secrets.NETWORK }} -p ${{ secrets.CONTAINER_PORT }} -t ${{ secrets.CONTAINER_REGISTRY_PROD }}:${{ secrets.IMAGE_TAG }} + docker run -d --name ${{ secrets.CONTAINER_NAME }} --network ${{ secrets.NETWORK }} -p ${{ secrets.CONTAINER_PORT }} -t ${{ secrets.CONTAINER_REGISTRY_PROD }}:${{ secrets.IMAGE_TAG }} restart:always From 853de3de91e86cd9b4e5440637e98df477c67570 Mon Sep 17 00:00:00 2001 From: prasadharke-tekdi <131845849+prasadharke-tekdi@users.noreply.github.com> Date: Tue, 23 Apr 2024 10:16:27 +0530 Subject: [PATCH 18/22] Update Dev.yml --- .github/workflows/Dev.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/Dev.yml b/.github/workflows/Dev.yml index 5d5eeac..da25299 100644 --- a/.github/workflows/Dev.yml +++ b/.github/workflows/Dev.yml @@ -59,4 +59,4 @@ jobs: docker pull ${{ secrets.CONTAINER_REGISTRY }}:${{ secrets.IMAGE_TAG }} - docker run -d --name ${{ secrets.CONTAINER_NAME }} --network ${{ secrets.NETWORK }} -p ${{ secrets.CONTAINER_PORT }} -t ${{ secrets.CONTAINER_REGISTRY }}:${{ secrets.IMAGE_TAG }} + docker run -d --name ${{ secrets.CONTAINER_NAME }} --network ${{ secrets.NETWORK }} -p ${{ secrets.CONTAINER_PORT }} -t ${{ secrets.CONTAINER_REGISTRY }}:${{ secrets.IMAGE_TAG }} restart:always From 752a0ffdf73b72d4e776a8a406661ab49e178a41 Mon Sep 17 00:00:00 2001 From: prasadharke-tekdi <131845849+prasadharke-tekdi@users.noreply.github.com> Date: Tue, 23 Apr 2024 10:24:38 +0530 Subject: [PATCH 19/22] Update Dev.yml --- .github/workflows/Dev.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/Dev.yml b/.github/workflows/Dev.yml index da25299..05a59fd 100644 --- a/.github/workflows/Dev.yml +++ b/.github/workflows/Dev.yml @@ -59,4 +59,4 @@ jobs: docker pull ${{ secrets.CONTAINER_REGISTRY }}:${{ secrets.IMAGE_TAG }} - docker run -d --name ${{ secrets.CONTAINER_NAME }} --network ${{ secrets.NETWORK }} -p ${{ secrets.CONTAINER_PORT }} -t ${{ secrets.CONTAINER_REGISTRY }}:${{ secrets.IMAGE_TAG }} restart:always + docker run -d --name ${{ secrets.CONTAINER_NAME }} --network ${{ secrets.NETWORK }} -p ${{ secrets.CONTAINER_PORT }} -t ${{ secrets.CONTAINER_REGISTRY }}:${{ secrets.IMAGE_TAG }} From 48ca5892a724b70034fbacc41a42231c3652b410 Mon Sep 17 00:00:00 2001 From: prasadharke-tekdi <131845849+prasadharke-tekdi@users.noreply.github.com> Date: Tue, 23 Apr 2024 10:24:55 +0530 Subject: [PATCH 20/22] Update Prod.yml --- .github/workflows/Prod.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/Prod.yml b/.github/workflows/Prod.yml index 0586e26..372f2f8 100644 --- a/.github/workflows/Prod.yml +++ b/.github/workflows/Prod.yml @@ -59,4 +59,4 @@ jobs: docker pull ${{ secrets.CONTAINER_REGISTRY_PROD }}:${{ secrets.IMAGE_TAG }} - docker run -d --name ${{ secrets.CONTAINER_NAME }} --network ${{ secrets.NETWORK }} -p ${{ secrets.CONTAINER_PORT }} -t ${{ secrets.CONTAINER_REGISTRY_PROD }}:${{ secrets.IMAGE_TAG }} restart:always + docker run -d --name ${{ secrets.CONTAINER_NAME }} --network ${{ secrets.NETWORK }} -p ${{ secrets.CONTAINER_PORT }} -t ${{ secrets.CONTAINER_REGISTRY_PROD }}:${{ secrets.IMAGE_TAG }} From e8a72abded3903170b0410b59b4dd139d49ae72a Mon Sep 17 00:00:00 2001 From: prasadharke-tekdi <131845849+prasadharke-tekdi@users.noreply.github.com> Date: Fri, 26 Apr 2024 10:38:19 +0530 Subject: [PATCH 21/22] Update Prod.yml --- .github/workflows/Prod.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/Prod.yml b/.github/workflows/Prod.yml index 372f2f8..0027b93 100644 --- a/.github/workflows/Prod.yml +++ b/.github/workflows/Prod.yml @@ -59,4 +59,5 @@ jobs: docker pull ${{ secrets.CONTAINER_REGISTRY_PROD }}:${{ secrets.IMAGE_TAG }} - docker run -d --name ${{ secrets.CONTAINER_NAME }} --network ${{ secrets.NETWORK }} -p ${{ secrets.CONTAINER_PORT }} -t ${{ secrets.CONTAINER_REGISTRY_PROD }}:${{ secrets.IMAGE_TAG }} + cd /home/alldevuser/all-services/all-content-service + docker-compose up -d --force-recreate --no-deps From 076f1db042535f1947155a14c8599b3976ff16ef Mon Sep 17 00:00:00 2001 From: prasadharke-tekdi <131845849+prasadharke-tekdi@users.noreply.github.com> Date: Fri, 26 Apr 2024 10:41:37 +0530 Subject: [PATCH 22/22] Update Prod.yml --- .github/workflows/Prod.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/Prod.yml b/.github/workflows/Prod.yml index 0027b93..b1d7938 100644 --- a/.github/workflows/Prod.yml +++ b/.github/workflows/Prod.yml @@ -59,5 +59,5 @@ jobs: docker pull ${{ secrets.CONTAINER_REGISTRY_PROD }}:${{ secrets.IMAGE_TAG }} - cd /home/alldevuser/all-services/all-content-service + cd /home/azureuser/all-services/all-content-service docker-compose up -d --force-recreate --no-deps