From 978b0c26e5ed337c1bd4d0f1c0b72e354ef55cce Mon Sep 17 00:00:00 2001 From: Robin Date: Thu, 16 Nov 2023 08:54:44 +0530 Subject: [PATCH 1/2] feat: trudesk --- .DS_Store | Bin 6148 -> 10244 bytes .env-local | 6 ++++ .gitmodules | 4 +++ biap-trudesk-service | 1 + docker-compose-for-local.yaml | 54 +++++++++++++++++++++++++++------- 5 files changed, 54 insertions(+), 11 deletions(-) create mode 160000 biap-trudesk-service diff --git a/.DS_Store b/.DS_Store index 6f814d755d2958da3386543dc7a2bad5953e99bb..de3633f705dcae52658717c5536acbf9b6bced8d 100644 GIT binary patch literal 10244 zcmeHMPjB2r6n~QjvfK2J(`0EPs8|RGq$VMhs8xkfx0_TD@h4F>goL(iZLhO&ATu@2;n5@Ud(KBvU)nMTD!@-PNhSsOO(N^05zq)|1T+E~0gb?a5drMk zoC<>p)lZFpMnEHQfB>%#Wn`w6l=K#f1PH82j`w3O7keQqw zM9M1CBZf%W@xIL6K`SZUPiVqUB4Hicq72udKS0s3cTBH3AxeqX_WX{S~rs zZgIW3{C|fx8MmXV8Q$gEvXq|HDVx@c>ulGJky+`- zrt3SQVsIM{y4?H3^&4`#D%*Y|QoOa~MWI+I){W8K-D@|mPn6%fabs_yynFN7^h9~) z`pn*5u}~U+jAGE^#+UbtKu9UFbIZVX$dz1a*|ms#n_u+@_ zM^4?ilSYMBvcr{aAs~Z<1JCvTcC?hv^rN4GB zf+gl-r#0`dON_V$D=Y;3Dq3;E2=oZg>V40&9B;v|$~cy-H8TuNzv)zWxF<`qrN0$196zOM$K;W#b8peViNh zRQ_iqvQO1BhwDfN*BC2iTiG#!*PXbA@_H`5$gJnDVV&K82iV}OV-1&(Raa|qjMfNV zQpY<9yS3mqTr=S{4NzXYdEIVc=Ll%0+k5)h_p;tIq~;f(zr;S{LPj%{6`^LKJ-6EP zOzGRqOs_x!?_rymR|qYWSp{h0J%jfjp8KR4f%i2}?Pz9?J&kvytmKzZk-V)m-+*iv z(oD>pk>UNahjg_|J&kk;JUJ#K{EnTw;Hb<>A3kyJ$IX$WtXm3Ogzd}tIiQTG4~#=- z8K6FemW>`Z&Pq8;AJ9C_(jEGUYIsfotwuMG^1llit6s(^5p?k24T&vdg)x7RB;PAM z9~(1JUnx0hu%yUJGvEX4oi_AHJodzBU|Z$*;mP1Vlo9}e%-2)*_-u_X{vs_w@7pwo z9iXTF0?2o96ckd+^f4{=!i(dmt3M25fBnyZNT2_4Hqz(+|MB_%Z}#sywg3PC delta 131 zcmZn(XfcprU|?W$DortDU=RQ@Ie-{MGqg=C6q~50D9Q+A12Ircmm!%Uhar<8l_76p zq55P+5$(yZMEN(CII%Bg=im@z2I&GSh($ diff --git a/.env-local b/.env-local index 38c6acdd..6980d381 100644 --- a/.env-local +++ b/.env-local @@ -58,5 +58,11 @@ BUGZILLA_ADMIN_EMAIL=--- EXPECTED_RESPONSE_TIME=PT1H EXPECTED_RESOLUTION_TIME=P1D +TRUDESK_EMAIL=example@gmail.com +TRUDESK_USERNAME=admin +TRUDESK_PASSWORD=password +SELECTED_ISSUE_CRM=TRUDESK +TRUDESK_BASE_URI=http://trudesk-dev-service:8118 + ENV_TYPE=testing ENV=development diff --git a/.gitmodules b/.gitmodules index e28244a7..6e245227 100644 --- a/.gitmodules +++ b/.gitmodules @@ -20,3 +20,7 @@ path = biap-bugzilla-service url = https://github.com/ONDC-Official/biap-bugzilla-service branch = main +[submodule "biap-trudesk-service"] + path = biap-trudesk-service + url = https://github.com/ONDC-Official/buyer-trudesk-service + branch = master \ No newline at end of file diff --git a/biap-trudesk-service b/biap-trudesk-service new file mode 160000 index 00000000..a096666b --- /dev/null +++ b/biap-trudesk-service @@ -0,0 +1 @@ +Subproject commit a096666b859094409fb717fe05563796cac6497b diff --git a/docker-compose-for-local.yaml b/docker-compose-for-local.yaml index a7c810d6..2efcaabb 100644 --- a/docker-compose-for-local.yaml +++ b/docker-compose-for-local.yaml @@ -1,5 +1,5 @@ version: "2" - + services: mongo: image: mongo @@ -8,7 +8,7 @@ services: - 27017:27017 volumes: - "./data:/data/db" - + mmi-client: image: navdeep710/ondc-ancillary-services:v3 container_name: map-client @@ -25,11 +25,11 @@ services: - 8000:8000 expose: - 8000 - + nginx: build: context: biap-app-ui-front - dockerfile: Dockerfile + dockerfile: DockerfileWithoutSSL args: REACT_APP_BASE_URL: ${REACT_APP_BASE_URL} REACT_APP_MMI_BASE_URL: ${REACT_APP_MMI_BASE_URL} @@ -61,7 +61,7 @@ services: volumes: - ./data/certbot/conf:/etc/letsencrypt - ./data/certbot/www:/var/www/certbot - + certbot: image: certbot/certbot restart: "always" @@ -69,7 +69,7 @@ services: - ./data/certbot/conf:/etc/letsencrypt - ./data/certbot/www:/var/www/certbot entrypoint: "/bin/sh -c 'trap exit TERM; while :; do certbot renew; sleep 12h & wait $${!}; done;'" - + biap-client-node-js: restart: "always" build: @@ -106,7 +106,7 @@ services: - 3000 depends_on: - mongo - + biap-igm-node-js: build: context: biap-igm-node-js @@ -120,6 +120,8 @@ services: EXPECTED_RESPONSE_TIME: ${EXPECTED_RESPONSE_TIME} EXPECTED_RESOLUTION_TIME: ${EXPECTED_RESOLUTION_TIME} BUGZILLA_API_KEY: ${BUGZILLA_API_KEY} + SELECTED_ISSUE_CRM: ${SELECTED_ISSUE_CRM} + TRUDESK_BASE_URI: ${TRUDESK_BASE_URI} BUGZILLA_SERVICE_URI: ${BUGZILLA_SERVICE_URI} BAP_URL: ${BAP_URL} VOLUME_IMAGES_BASE_URL: ${VOLUME_IMAGES_BASE_URL} @@ -133,9 +135,11 @@ services: volumes: - "./images:/app/images" restart: always - + py-ondc-protocol: - image: navdeep710/ondc-protocol-layer-server:pr-sse-v7.8 + build: + context: py-ondc-protocol/webserver/ + dockerfile: Dockerfile container_name: py-ondc-protocol environment: ENV: ${PROTOCOL_ENV} @@ -154,7 +158,7 @@ services: - 5555 depends_on: - mongo - + bugzilla-node-backend: container_name: bugzilla-node-dev build: @@ -163,14 +167,18 @@ services: environment: ENV: prod BUGZILLA_API_KEY: ${BUGZILLA_API_KEY} + SELECTED_ISSUE_CRM: ${SELECTED_ISSUE_CRM} + TRUDESK_BASE_URI: ${TRUDESK_BASE_URI} BUGZILLA_BASE_URI: ${BUGZILLA_BASE_URI} BUGZILLA_ADMIN_EMAIL: ${BUGZILLA_ADMIN_EMAIL} + TRUDESK_USERNAME: ${TRUDESK_USERNAME} + TRUDESK_PASSWORD: ${TRUDESK_PASSWORD} ports: - "8001:8001" expose: - 8001 restart: always - + bugzilla-dev-service: build: context: ./biap-bugzilla-service/bugzilla-main @@ -178,8 +186,32 @@ services: environment: BUGZILLA_WWW: /var/www/html/bugzilla/ BUGZILLA_ADMIN_EMAIL: ${BUGZILLA_ADMIN_EMAIL} + container_name: bugzilla-dev-service image: shameerkc/bugzilla-dev-sqlite ports: - "90:80" - "5989:5900" + + trudesk-dev-service: + container_name: trudesk-dev-service + build: + context: biap-trudesk-service/ + dockerfile: Dockerfile + restart: always + ports: + - "8118:8118" + dns: + - "1.1.1.1" + - "8.8.8.8" + environment: + TRUDESK_DOCKER: "true" + TD_MONGODB_SERVER: mongo + TD_MONGODB_DATABASE: trudesk + USE_XFORWARDIP: "true" + REACT_APP_BASE_URL: ${REACT_APP_BASE_URL} + TRUDESK_EMAIL: ${TRUDESK_EMAIL} + TRUDESK_USERNAME: ${TRUDESK_USERNAME} + TRUDESK_PASSWORD: ${TRUDESK_PASSWORD} + + \ No newline at end of file From 630c063e008451dfba6776aceaabb5082b3f90fa Mon Sep 17 00:00:00 2001 From: Robin Chauhan Date: Thu, 23 Nov 2023 11:56:29 +0530 Subject: [PATCH 2/2] fix: bugzilla removed as default service and updated the readme --- .DS_Store | Bin 10244 -> 10244 bytes .env-local | 1 + README.md | 54 ++++++++++++++++++++++++++++++++-- docker-compose-for-local.yaml | 16 +--------- 4 files changed, 54 insertions(+), 17 deletions(-) diff --git a/.DS_Store b/.DS_Store index de3633f705dcae52658717c5536acbf9b6bced8d..8ad6d3f5357065aa13a88f728e266677d366684d 100644 GIT binary patch delta 184 zcmZn(XbG6$&nUeyU^hRb^kyD`HkQduq758|#>P4dre=ndHwfBq&K418L=l;MQuKi= z3quM+B0~v7qGwKia#Buy5(5K+01&TdU|_77$LFBZx2;LMcNq{Jc)P7cm^ P0g38rO3j`;Pb>fc5UMcz delta 62 zcmZn(XbG6$&nUSuU^hRb