Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Prod v2 #566

Open
wants to merge 1,555 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 250 commits
Commits
Show all changes
1555 commits
Select commit Hold shift + click to select a range
4f14e37
Update tl-reports.yml
gurpreetsinghkhanna Jul 18, 2023
ae81ebe
Update IFMS integration query
deepgumber9996 Jul 27, 2023
46f0332
Merge pull request #640 from deepgumber9996/patch-1
gurpreetsinghkhanna Jul 27, 2023
27ee903
correct query for sw and ws locality search
palak-egov Aug 1, 2023
16ab197
Merge pull request #642 from palak-egov/patch-1
vinothrallapalli-eGov Aug 1, 2023
5ea03e9
Rollback ifms intigration query
deepgumber9996 Aug 1, 2023
d91d4c2
Merge pull request #643 from deepgumber9996/patch-2
rahul6234 Aug 1, 2023
3ddf15e
updated rollback
rahul6234 Aug 1, 2023
2180c8f
updated syntax
rahul6234 Aug 1, 2023
56b59c8
[UM-4633]
palak-egov Aug 2, 2023
22094ec
Merge pull request #644 from palak-egov/patch-2
vinothrallapalli-eGov Aug 2, 2023
2fc5425
[UM-6440]
palak-egov Aug 2, 2023
22386ef
Merge pull request #646 from palak-egov/PROD_V2
vinothrallapalli-eGov Aug 2, 2023
b5e4cb0
Update IFMS integration
deepgumber9996 Aug 14, 2023
d8bf01a
Merge pull request #648 from deepgumber9996/PROD_V2-1
gurpreetsinghkhanna Aug 14, 2023
6269f95
property list report.yml
gurpreetsinghkhanna Aug 14, 2023
53d5fdc
added PropertyListReport as dump report
gurpreetsinghkhanna Aug 15, 2023
2bf7554
PropertyListReport search parameters
Kabirmis Aug 18, 2023
9f58da8
Merge pull request #650 from Kabirmis/PROD_V2-1
gurpreetsinghkhanna Aug 18, 2023
5b515ea
locality search in PropertyListReport
gurpreetsinghkhanna Aug 22, 2023
bb52962
property list report propertystatus filteration
gurpreetsinghkhanna Aug 25, 2023
64ae086
Update rainmaker-pt-gissearch.yml
deepgumber9996 Aug 29, 2023
4fe9b16
Merge pull request #657 from deepgumber9996/patch-3
gurpreetsinghkhanna Aug 29, 2023
b1b26c2
ifms integration
deepgumber9996 Aug 29, 2023
8b305b6
Merge pull request #658 from deepgumber9996/patch-4
gurpreetsinghkhanna Aug 29, 2023
7c0b366
included NEFT RTGS in DAilyCollectionReport
gurpreetsinghkhanna Sep 13, 2023
d5421df
added OFFLINE_NEFT,OFFLINE_RTGS in DailyChequeDetail Report
gurpreetsinghkhanna Sep 15, 2023
463269e
added AccountCodeReport as per Accouting manual
gurpreetsinghkhanna Sep 15, 2023
2b029f0
updated PAID property report to filter with ownership category also
gurpreetsinghkhanna Oct 12, 2023
e7c0ee1
view paid properties by ownership category and FY
gurpreetsinghkhanna Oct 12, 2023
ee9d626
added property search report by ownership category
gurpreetsinghkhanna Oct 16, 2023
4b30e24
estimation charge report in prod v2
abhirana04 Nov 2, 2023
d670893
Merge pull request #661 from abhirana04/patch-7
gurpreetsinghkhanna Nov 2, 2023
945ed00
removal of extra search param in w report
abhirana04 Nov 2, 2023
5e8ca70
Merge pull request #662 from abhirana04/patch-8
gurpreetsinghkhanna Nov 2, 2023
4801eb4
change in estimation report
abhirana04 Nov 2, 2023
d8bea72
Merge pull request #663 from abhirana04/patch-9
erramesh000 Nov 2, 2023
a43b56f
Update ws-reports.yml
abhirana04 Nov 2, 2023
4faa1aa
Merge pull request #664 from abhirana04/patch-10
erramesh000 Nov 2, 2023
3363272
Update ws-reports.yml
abhirana04 Nov 2, 2023
92ba47e
Merge pull request #666 from abhirana04/patch-12
erramesh000 Nov 2, 2023
c176f73
Update ws-reports.yml
abhirana04 Nov 2, 2023
9ce6306
Merge pull request #667 from abhirana04/patch-13
erramesh000 Nov 2, 2023
0bd18b9
Update ws-reports.yml
abhirana04 Nov 3, 2023
38791c6
Merge pull request #668 from abhirana04/patch-14
erramesh000 Nov 3, 2023
3a314d4
removal of extra code
abhirana04 Nov 6, 2023
deb8887
Merge pull request #669 from abhirana04/patch-15
gurpreetsinghkhanna Nov 6, 2023
1b5069b
correction estimation_charge report
gurpreetsinghkhanna Nov 6, 2023
7aa0c60
search parameters estimation_charge report
gurpreetsinghkhanna Nov 6, 2023
d32b4f9
addition of usage category wise data
abhirana04 Nov 6, 2023
73590c6
Merge pull request #671 from abhirana04/patch-17
gurpreetsinghkhanna Nov 6, 2023
97c9224
change in from to date for usageType report
abhirana04 Nov 7, 2023
9a9fc1a
Merge pull request #672 from abhirana04/patch-18
gurpreetsinghkhanna Nov 7, 2023
4f455dd
Update ws-reports.yml
abhirana04 Nov 7, 2023
8eeb56a
Merge pull request #673 from abhirana04/patch-19
gurpreetsinghkhanna Nov 7, 2023
961c769
added generated demand report
abhirana04 Nov 10, 2023
4a33489
Merge pull request #674 from abhirana04/patch-21
simar1977 Nov 14, 2023
3897313
Update ws-reports.yml
abhirana04 Nov 15, 2023
3f22c8e
Merge pull request #675 from abhirana04/patch-22
simar1977 Nov 15, 2023
5a90d44
Update ws-reports.yml
abhirana04 Nov 15, 2023
f33735c
Merge pull request #676 from abhirana04/patch-23
erramesh000 Nov 15, 2023
99dda97
Update ws-reports.yml
abhirana04 Nov 15, 2023
527485f
Merge pull request #677 from abhirana04/patch-24
erramesh000 Nov 15, 2023
bd93aa0
Update ws-reports.yml
abhirana04 Nov 15, 2023
8b90125
Merge pull request #678 from abhirana04/patch-25
erramesh000 Nov 15, 2023
2ea0391
Update ws-reports.yml
abhirana04 Nov 15, 2023
8745fe0
Merge pull request #679 from abhirana04/patch-26
erramesh000 Nov 15, 2023
f6aae3d
Update ws-reports.yml
abhirana04 Nov 17, 2023
c9a8e11
Merge pull request #680 from abhirana04/patch-27
gurpreetsinghkhanna Nov 17, 2023
089eb74
change in query or generated demand report
abhirana04 Nov 17, 2023
821782a
Merge pull request #681 from abhirana04/patch-28
erramesh000 Nov 17, 2023
a8d0951
Update ws-reports.yml
abhirana04 Nov 17, 2023
cce3f35
Merge pull request #682 from abhirana04/patch-29
erramesh000 Nov 17, 2023
b4df519
Update ws-reports.yml
abhirana04 Nov 17, 2023
6c2a315
Merge pull request #683 from abhirana04/patch-30
gurpreetsinghkhanna Nov 17, 2023
45de2b6
Update ws-reports.yml
abhirana04 Nov 17, 2023
8d12442
Merge pull request #684 from abhirana04/patch-31
gurpreetsinghkhanna Nov 17, 2023
6f97429
Update ws-reports.yml
abhirana04 Nov 17, 2023
df9de01
Merge pull request #685 from abhirana04/patch-32
gurpreetsinghkhanna Nov 17, 2023
5840cb0
Update uc-reports.yml echallan report v2
gurpreetsinghkhanna Nov 23, 2023
95cc30f
Update uc-reports.yml echall report
gurpreetsinghkhanna Nov 23, 2023
a39bb4e
Update uc-reports.yml
gurpreetsinghkhanna Nov 23, 2023
ec18ce8
echallan update report
gurpreetsinghkhanna Nov 23, 2023
c5ecbed
Update uc-reports.yml
gurpreetsinghkhanna Nov 28, 2023
d0383d0
Update uc-reports.yml
gurpreetsinghkhanna Nov 28, 2023
ebc8062
Update uc-reports.yml challan report changes
gurpreetsinghkhanna Nov 29, 2023
355b471
Update uc-reports door street building name added
gurpreetsinghkhanna Dec 4, 2023
3047263
added countOpen to fetch open complaints for 24 hrs
gurpreetsinghkhanna Dec 11, 2023
44f956a
updated text for testing
erramesh000 Dec 20, 2023
4b08157
Updated property id pdf
erramesh000 Dec 20, 2023
74d5d0d
removed property
erramesh000 Dec 20, 2023
c122e05
Updated property id
erramesh000 Dec 20, 2023
a61e82a
remove old consumer number
erramesh000 Dec 20, 2023
0dcdf36
Updated propertyid PDF
erramesh000 Dec 20, 2023
be5172e
Replaced street name to propertyid
erramesh000 Dec 20, 2023
a9a1559
Updated address
erramesh000 Dec 21, 2023
f155755
Change revert
erramesh000 Dec 21, 2023
072d9e5
Update ws-reports.yml
DheerajKapoor15 Dec 26, 2023
05e7ced
Merge pull request #686 from DheerajKapoor15/patch-2
erramesh000 Dec 26, 2023
4951429
Update ws-onetime-receipt.json
erramesh000 Jan 3, 2024
49c6b71
Update ws-onetime-receipt.json
erramesh000 Jan 3, 2024
7e53c2d
Update ws-onetime-receipt.json
gurpreetsinghkhanna Jan 3, 2024
13b658b
Update ws-onetime-receipt.json pdf
gurpreetsinghkhanna Jan 3, 2024
3b9cdea
Update ws-bill.json
erramesh000 Jan 5, 2024
918e96d
Update ws-bill.json
erramesh000 Jan 8, 2024
3a1d540
correction firenoc receipt register
abhirana04 Jan 8, 2024
c0daea3
Merge pull request #687 from abhirana04/patch-33
gurpreetsinghkhanna Jan 8, 2024
1cf0ccf
Update ws-bill.json
erramesh000 Jan 8, 2024
b1d1a89
Update ws-bill.json
erramesh000 Jan 8, 2024
8163f7f
corrected query for firenoc receipt register
abhirana04 Jan 9, 2024
a94c0fe
removed hard codes firenoc receiptregister
gurpreetsinghkhanna Jan 9, 2024
3adeccc
Merge pull request #688 from abhirana04/patch-34
gurpreetsinghkhanna Jan 9, 2024
3566d80
UM-6683 UC todays collection showing zero
palak-egov Jan 10, 2024
072c210
Merge pull request #689 from palak-egov/patch-1
vinothrallapalli-eGov Jan 10, 2024
45eda42
Update pt-reports.yml defaulter
gurpreetsinghkhanna Jan 11, 2024
a056012
Update ws-onetime-receipt.json
erramesh000 Jan 15, 2024
ac82c8b
Update property-receipt.json
erramesh000 Jan 23, 2024
f0f2abc
Update property-receipt.json
erramesh000 Jan 23, 2024
098d1ff
Update pt-reports.yml
gurpreetsinghkhanna Jan 25, 2024
bf4549e
summary receipt register updated with toalamount
gurpreetsinghkhanna Feb 6, 2024
8244880
check commit
erramesh000 Feb 8, 2024
a82a208
changes for water sewerage query
abhirana04 Feb 8, 2024
343e1b7
Merge pull request #691 from abhirana04/patch-36
simar1977 Feb 8, 2024
bb65f28
change in water query
abhirana04 Feb 8, 2024
bfb5504
Merge pull request #692 from abhirana04/patch-37
simar1977 Feb 9, 2024
f57330c
addition of column usagetype in ws generarted report
abhirana04 Feb 9, 2024
8d86135
Merge pull request #693 from abhirana04/patch-38
simar1977 Feb 9, 2024
1b40d1a
Update ws-reports.yml
gurpreetsinghkhanna Feb 9, 2024
5ebf92b
Update ws-reports.yml
gurpreetsinghkhanna Feb 9, 2024
21d8503
Update ws-reports.yml
gurpreetsinghkhanna Feb 9, 2024
a20ab47
Update ws-reports.yml
gurpreetsinghkhanna Feb 9, 2024
3707eab
Update ws-onetime-receipt.json
erramesh000 Feb 10, 2024
93cf016
Revert change
erramesh000 Feb 10, 2024
80c88a9
correction summary receiptregister
gurpreetsinghkhanna Feb 13, 2024
d1646f8
Change layout PDF
erramesh000 Feb 13, 2024
11f5945
Update ws-onetime-receipt.json
erramesh000 Feb 13, 2024
3a4df9c
Update pt-reports.yml
gurpreetsinghkhanna Feb 14, 2024
07c35d7
Update ws-bill.json
erramesh000 Feb 14, 2024
46b8ff3
Update pt-reports.yml
gurpreetsinghkhanna Feb 14, 2024
4e3b4b0
Update pt-reports.yml
gurpreetsinghkhanna Feb 14, 2024
b6ca8be
connection count
gurpreetsinghkhanna Feb 14, 2024
4e40d2f
connection count
gurpreetsinghkhanna Feb 14, 2024
aa76542
Update ws-reports.yml count connection
gurpreetsinghkhanna Feb 15, 2024
69ed8ac
count connection report
gurpreetsinghkhanna Feb 15, 2024
f7ea140
Update ws-reports.yml
gurpreetsinghkhanna Feb 15, 2024
6e3464a
Update ws-reports.yml
gurpreetsinghkhanna Feb 15, 2024
64e24b1
Update ws-reports.yml
gurpreetsinghkhanna Feb 15, 2024
ab8bf7f
Update ws-reports.yml
gurpreetsinghkhanna Feb 15, 2024
2cde4b7
Update ws-reports.yml
gurpreetsinghkhanna Feb 15, 2024
57c9273
Update ws-reports.yml
gurpreetsinghkhanna Feb 15, 2024
ce2b719
Update ws-reports.yml
atul6261 Feb 15, 2024
30daf57
Merge pull request #694 from atul6261/patch-7
gurpreetsinghkhanna Feb 15, 2024
e9d99d1
Update ws-reports.yml
atul6261 Feb 15, 2024
791f4c1
Merge pull request #695 from atul6261/patch-8
gurpreetsinghkhanna Feb 15, 2024
d9da4de
Update tl-reports.yml
gurpreetsinghkhanna Feb 29, 2024
aba240a
Update tl-reports.yml
gurpreetsinghkhanna Feb 29, 2024
73654eb
Update tl-reports.yml
gurpreetsinghkhanna Feb 29, 2024
5770678
Update tl-reports.yml
gurpreetsinghkhanna Feb 29, 2024
c67f34b
Update tl-reports.yml
gurpreetsinghkhanna Mar 11, 2024
62297db
Update ws-onetime-receipt.json
erramesh000 Mar 12, 2024
5b81766
Update ws-onetime-receipt.json
erramesh000 Mar 12, 2024
88049c0
Update land area ws-onetime-receipt.json
erramesh000 Mar 13, 2024
3418356
Update pt-reports.yml
gurpreetsinghkhanna Mar 14, 2024
b63d610
Update ws-reports.yml
gurpreetsinghkhanna Mar 15, 2024
d7b25fb
revert ws-onetime-receipt.json
erramesh000 Mar 15, 2024
32af353
Revert ws-onetime-receipt.json
erramesh000 Mar 15, 2024
006d86a
Revert ws-onetime-receipt.json
erramesh000 Mar 15, 2024
1903be2
Revert ws-onetime-receipt.json
erramesh000 Mar 15, 2024
695fc35
Update ws-reports.yml ws defaulter
gurpreetsinghkhanna Mar 19, 2024
7ba5d84
Update ws-reports.yml sw defaulter
gurpreetsinghkhanna Mar 19, 2024
0a6a764
Update ws-reports.yml
gurpreetsinghkhanna Mar 19, 2024
a031897
Update ws-reports.yml
gurpreetsinghkhanna Mar 20, 2024
0158611
Update ws-reports.yml
gurpreetsinghkhanna Mar 20, 2024
1334fa7
Update ws-reports.yml
gurpreetsinghkhanna Mar 20, 2024
533508c
Update ws-reports.yml
gurpreetsinghkhanna Mar 20, 2024
89c1d19
Update ws-reports.yml
gurpreetsinghkhanna Mar 20, 2024
eafc973
Update ws-reports.yml
gurpreetsinghkhanna Mar 20, 2024
7e656b4
Update ws-reports.yml
gurpreetsinghkhanna Mar 21, 2024
5138eba
Update ws-reports.yml
gurpreetsinghkhanna Mar 21, 2024
f29ab5e
Update ws-reports.yml
gurpreetsinghkhanna Mar 21, 2024
782f711
Update ws-reports.yml
gurpreetsinghkhanna Mar 21, 2024
1239087
Update pt-reports.yml
gurpreetsinghkhanna Mar 26, 2024
de11adb
Update ws-reports.yml SW REPORT
gurpreetsinghkhanna Mar 26, 2024
c67a6c1
Update ws-reports.yml sw rp
gurpreetsinghkhanna Mar 26, 2024
ca189c1
Update usagestype address
erramesh000 Apr 16, 2024
a78d149
Update ws-onetime-receipt.json
erramesh000 Apr 16, 2024
51360ed
Update ws-reports.yml
gurpreetsinghkhanna Apr 22, 2024
855f65a
Update ws-reports.yml ws and sw dump
gurpreetsinghkhanna Apr 23, 2024
c098d8e
Update ws-reports.yml
gurpreetsinghkhanna Apr 25, 2024
e274bfd
Update ws-reports.yml
gurpreetsinghkhanna Apr 25, 2024
16c406d
Update ws-applicationsewerage.json
erramesh000 Apr 25, 2024
217a4e4
Update ws-applicationsewerage.json
erramesh000 Apr 25, 2024
deaecc9
Update ws-reports.yml
gurpreetsinghkhanna Apr 26, 2024
7816391
Update ws-reports.yml
gurpreetsinghkhanna Apr 26, 2024
a741ce9
Update ws-reports.yml
gurpreetsinghkhanna Apr 26, 2024
8c5cc11
Update ws-reports.yml
gurpreetsinghkhanna Apr 26, 2024
7591311
Update ws-reports.yml
gurpreetsinghkhanna Apr 29, 2024
729fb4e
Update uc-reports.yml
gurpreetsinghkhanna Apr 30, 2024
fa94170
Update ws-bill.json
erramesh000 May 7, 2024
37a80b1
Update sw-bill.json
erramesh000 May 7, 2024
574652a
Update ws-onetime-receipt.json
erramesh000 May 8, 2024
516e99e
Update ws-onetime-receipt.json
erramesh000 May 8, 2024
7268540
Update ws-onetime-receipt.json
erramesh000 May 8, 2024
36bb0da
ReceiptRegisterSW changes
gurpreetsinghkhanna May 23, 2024
87f5d94
Update ws-reports.yml ws dump report
gurpreetsinghkhanna May 23, 2024
2fffd64
Update ws-reports.yml
gurpreetsinghkhanna May 23, 2024
5952495
Update ws-reports.yml
gurpreetsinghkhanna May 23, 2024
0af31ab
Update ws-reports.yml
gurpreetsinghkhanna May 23, 2024
2b01341
Update sw-reports.yml
gurpreetsinghkhanna May 24, 2024
37887df
Update ws-reports.yml
gurpreetsinghkhanna May 24, 2024
997f49b
Update meter reading report
gurpreetsinghkhanna May 24, 2024
8c2f837
Update ws-reports.yml
gurpreetsinghkhanna May 24, 2024
110aaa9
Update ws-reports.yml sw demand
gurpreetsinghkhanna May 24, 2024
5f00144
Update ws-reports.yml
gurpreetsinghkhanna May 24, 2024
29a5766
Update ws-reports.yml
gurpreetsinghkhanna May 24, 2024
7fefb38
Update ws-reports.yml
gurpreetsinghkhanna May 24, 2024
3acd1e6
Update ws-reports.yml
gurpreetsinghkhanna May 24, 2024
918335a
Update ws-reports.yml
gurpreetsinghkhanna May 27, 2024
257ddd1
Update ws-reports.yml
gurpreetsinghkhanna May 27, 2024
e627693
Update ws-reports.yml sw
gurpreetsinghkhanna May 28, 2024
b3a0a89
Update ws-reports.yml
gurpreetsinghkhanna May 31, 2024
cb50699
Update ws-reports.yml
gurpreetsinghkhanna May 31, 2024
da14438
Update ws-reports.yml
gurpreetsinghkhanna May 31, 2024
37879d2
Fixed Bill for Period sw-bill.json
erramesh000 Jun 5, 2024
6b61e5b
Fixed issues sw-bill.json
erramesh000 Jun 5, 2024
8ca0317
Fixed issues date sw-bill.json
erramesh000 Jun 5, 2024
9b317b5
Update ws-reports.yml
gurpreetsinghkhanna Jun 13, 2024
ddad2f4
Update ws-reports.yml
gurpreetsinghkhanna Jun 13, 2024
4cfe49d
Update ws-reports.yml
gurpreetsinghkhanna Jun 13, 2024
1dc09f2
Update ws-reports.yml
gurpreetsinghkhanna Jun 13, 2024
37b207c
Update ws-reports.yml
gurpreetsinghkhanna Jun 13, 2024
84c4c6c
Update ws-reports.yml
gurpreetsinghkhanna Jun 13, 2024
8836c23
Update ws-reports.yml
gurpreetsinghkhanna Jun 13, 2024
1931ddb
Update ws-reports.yml
gurpreetsinghkhanna Jun 13, 2024
6c0dc9e
Remove logo
vinothrallapalli-eGov Jul 7, 2024
740afea
Remove logo
vinothrallapalli-eGov Jul 7, 2024
6285ee2
Update logo URL
vinothrallapalli-eGov Jul 7, 2024
42c5771
Add logo
vinothrallapalli-eGov Jul 7, 2024
eff2b7d
Update logo path
vinothrallapalli-eGov Jul 7, 2024
655605c
added searchGisMap for GIS integration
gurpreetsinghkhanna Jul 8, 2024
4026cc1
syntax
gurpreetsinghkhanna Jul 8, 2024
0228a5e
Update rainmaker-pt-gissearch.yml
gurpreetsinghkhanna Jul 8, 2024
55343f0
Update rainmaker-pt-gissearch.yml
gurpreetsinghkhanna Jul 8, 2024
31339b2
Update rainmaker-pt-gissearch.yml
gurpreetsinghkhanna Jul 8, 2024
cb66a47
Update ws-reports.yml
gurpreetsinghkhanna Jul 15, 2024
3554231
gis search query update for NIC
gurpreetsinghkhanna Jul 22, 2024
c57635f
gis search by town
gurpreetsinghkhanna Jul 22, 2024
9987492
Update rainmaker-pt-gissearch.yml
gurpreetsinghkhanna Jul 22, 2024
b1036be
Update rainmaker-pt-gissearch.yml
gurpreetsinghkhanna Jul 22, 2024
5f3f20f
fy 2024-256 Reports changes
gurpreetsinghkhanna Aug 6, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 2 additions & 40 deletions Jenkinsfile
Original file line number Diff line number Diff line change
@@ -1,41 +1,3 @@
def app = "";
def commit_id="";
def module_name = "${env.JOB_NAME}".split("/")[-2];
def service_name = "${env.JOB_BASE_NAME}";
def path = "${module_name}/${service_name}"
def build_wkflo;
def ci_image = "egovio/ci:0.0.4"
def notifier = "";
library 'ci-libs'

try {
node("slave"){
checkout scm
sh "git rev-parse --short HEAD > .git/commit-id".trim()
commit_id = readFile('.git/commit-id')

def docker_file_exists = fileExists("${path}/Dockerfile")

code_builder = load("jenkins/code_builder.groovy")
notifier = load("jenkins/notifier.groovy")
currentBuild.displayName = "${BUILD_ID}-${commit_id}"

if (!docker_file_exists) {
code_builder.build(path, ci_image)
}
else {
archiver = load("jenkins/archiver.groovy")
image_builder = load("jenkins/image_builder.groovy")
code_builder.build(path, ci_image)
archiver.archiveArtifacts(["${path}/target/*.jar", "${path}/target/*.html"])
image_builder.build(module_name, service_name, commit_id)
image_builder.publish(service_name, commit_id)
image_builder.clean(service_name, commit_id)
}
}
} catch (e) {
node{
echo
notifier.notifyBuild("FAILED")
throw e
}
}
buildPipeline(configFile: './build/build-config.yml')
15 changes: 15 additions & 0 deletions build/build-config.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
#
# config:
# - name: < Name of the job, foo/bar would create job named bar inside folder foo >
# build:
# - work-dir: < Working directory of the app to be built >
# dockerfile: < Path to the dockerfile, optional, assumes dockerfile in working directory if not provided >
# image-name: < Docker image name >
# -
# -
config:
- name: "builds/punjab-rainmaker-customization/rainmaker-custom-service"
build:
- work-dir: "rainmaker-custom-service"
image-name: "rainmaker-custom-service"
dockerfile: "rainmaker-custom-service/Dockerfile"
9 changes: 9 additions & 0 deletions build/maven/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
FROM node:8.12-alpine
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Consider using a more recent version of Node.js to ensure security and compatibility. Node.js 8.12 is outdated and may not receive security updates.

- FROM node:8.12-alpine
+ FROM node:16-alpine

Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation.

Suggested change
FROM node:8.12-alpine
FROM node:16-alpine

RUN npm install -g yarn
RUN mkdir /opt/app
COPY package.json yarn.lock /opt/app/
WORKDIR /opt/app
RUN yarn install
COPY . /opt/app
Comment on lines +4 to +7
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Optimize Docker layer caching by copying package.json and yarn.lock separately before running yarn install. This minimizes unnecessary reinstalls when other files change.

COPY package.json yarn.lock /opt/app/ 
RUN yarn install
+ COPY . /opt/app

Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation.

Suggested change
COPY package.json yarn.lock /opt/app/
WORKDIR /opt/app
RUN yarn install
COPY . /opt/app
COPY package.json yarn.lock /opt/app/
WORKDIR /opt/app
RUN yarn install
COPY . /opt/app

CMD ["node", "index.js"]

11 changes: 11 additions & 0 deletions build/maven/start.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
#!/bin/sh

if [[ -z "${JAVA_OPTS}" ]];then
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The script uses [[ for conditionals, which is more specific to bash. Ensure the script's shebang line matches the shell features used (#!/bin/sh might not support [[).

- #!/bin/sh
+ #!/bin/bash

Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation.

Suggested change
if [[ -z "${JAVA_OPTS}" ]];then
#!/bin/bash
if [[ -z "${JAVA_OPTS}" ]];then

export JAVA_OPTS="-Xmx64m -Xms64m"
fi

if [ x"${JAVA_ENABLE_DEBUG}" != x ] && [ "${JAVA_ENABLE_DEBUG}" != "false" ]; then
java_debug_args="-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=${JAVA_DEBUG_PORT:-5005}"
fi

exec java ${java_debug_args} ${JAVA_OPTS} ${JAVA_ARGS} -jar /opt/egov/*.jar
Comment on lines +7 to +11
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The script effectively handles Java options and debugging. Consider documenting the environment variables (JAVA_OPTS, JAVA_ENABLE_DEBUG, JAVA_DEBUG_PORT) used in the script for better maintainability and user guidance.

11 changes: 11 additions & 0 deletions configs/egov-dss-dashboards/.project
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>egov-dss-dashboards</name>
<comment></comment>
<projects>
</projects>
<buildSpec>
</buildSpec>
<natures>
</natures>
</projectDescription>
2,184 changes: 1,932 additions & 252 deletions configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json

Large diffs are not rendered by default.

Loading