Skip to content

Commit 7c3ccf6

Browse files
author
Kerkesni
committed
BB-295 - fix image build issue
1 parent 1656cc3 commit 7c3ccf6

File tree

3 files changed

+114
-24
lines changed

3 files changed

+114
-24
lines changed

‎Dockerfile‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,11 @@ RUN wget https://github.com/jwilder/dockerize/releases/download/$DOCKERIZE_VERSI
2828
&& tar -C /usr/local/bin -xzvf dockerize-linux-amd64-$DOCKERIZE_VERSION.tar.gz \
2929
&& rm dockerize-linux-amd64-$DOCKERIZE_VERSION.tar.gz
3030

31-
COPY package.json yarn.lock /usr/src/app/
31+
COPY . /usr/src/app
3232
RUN yarn install --ignore-engines --frozen-lockfile --production --network-concurrency 1 \
3333
&& rm -rf /var/lib/apt/lists/* \
3434
&& rm -rf ~/.node-gyp \
3535
&& rm -rf /tmp/yarn-*
36-
COPY . /usr/src/app
3736
RUN yarn build
3837

3938
################################################################################
@@ -47,10 +46,11 @@ RUN apt-get update && \
4746
WORKDIR /usr/src/app
4847

4948
# Keep the .git directory in order to properly report version
49+
COPY . ./
50+
COPY --from=builder /usr/src/app/dist ./
5051
COPY --from=builder /usr/src/app/node_modules ./node_modules/
5152
COPY --from=builder /usr/local/bin/dockerize /usr/local/bin/
5253

53-
5454
ENTRYPOINT ["/usr/src/app/docker-entrypoint.sh"]
5555

5656
EXPOSE 8900

‎package.json‎

Lines changed: 20 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -2,21 +2,21 @@
22
"name": "backbeat",
33
"version": "8.6.1",
44
"description": "Asynchronous queue and job manager",
5-
"main": "dist/index.js",
5+
"main": "index.js",
66
"scripts": {
7-
"queue_populator": "BACKBEAT_QUEUEPOPULATOR_EXTENSIONS=replication,lifecycle node dist/bin/queuePopulator.js",
8-
"queue_processor": "node dist/extensions/replication/queueProcessor/task.js",
9-
"replication_populator": "BACKBEAT_QUEUEPOPULATOR_EXTENSIONS=replication node dist/bin/queuePopulator.js",
10-
"ingestion_populator": "node dist/bin/ingestion.js",
11-
"replication_status_processor": "node dist/extensions/replication/replicationStatusProcessor/task.js",
12-
"lifecycle_populator": "BACKBEAT_QUEUEPOPULATOR_EXTENSIONS=lifecycle node dist/bin/queuePopulator.js",
13-
"lifecycle_conductor": "node dist/extensions/lifecycle/conductor/service.js",
14-
"lifecycle_bucket_processor": "node dist/extensions/lifecycle/bucketProcessor/task.js",
15-
"lifecycle_object_processor": "node dist/extensions/lifecycle/objectProcessor/task.js",
16-
"lifecycle_object_transition_processor": "LIFECYCLE_OBJECT_PROCESSOR_TYPE=transition node dist/extensions/lifecycle/objectProcessor/task.js",
17-
"oplog_populator": "node dist/extensions/oplogPopulator/OplogPopulatorTask.js",
18-
"mongo_queue_processor": "node dist/extensions/mongoProcessor/mongoProcessorTask.js",
19-
"garbage_collector": "node dist/extensions/gc/service.js",
7+
"queue_populator": "BACKBEAT_QUEUEPOPULATOR_EXTENSIONS=replication,lifecycle node bin/queuePopulator.js",
8+
"queue_processor": "node extensions/replication/queueProcessor/task.js",
9+
"replication_populator": "BACKBEAT_QUEUEPOPULATOR_EXTENSIONS=replication node bin/queuePopulator.js",
10+
"ingestion_populator": "node bin/ingestion.js",
11+
"replication_status_processor": "node extensions/replication/replicationStatusProcessor/task.js",
12+
"lifecycle_populator": "BACKBEAT_QUEUEPOPULATOR_EXTENSIONS=lifecycle node bin/queuePopulator.js",
13+
"lifecycle_conductor": "node extensions/lifecycle/conductor/service.js",
14+
"lifecycle_bucket_processor": "node extensions/lifecycle/bucketProcessor/task.js",
15+
"lifecycle_object_processor": "node extensions/lifecycle/objectProcessor/task.js",
16+
"lifecycle_object_transition_processor": "LIFECYCLE_OBJECT_PROCESSOR_TYPE=transition node extensions/lifecycle/objectProcessor/task.js",
17+
"oplog_populator": "node extensions/oplogPopulator/OplogPopulatorTask.js",
18+
"mongo_queue_processor": "node extensions/mongoProcessor/mongoProcessorTask.js",
19+
"garbage_collector": "node extensions/gc/service.js",
2020
"test": "jest /unit --forceExit",
2121
"ft_test": "jest /functional --forceExit --testTimeout 30000",
2222
"ft_test:notification": "jest /functional/notification --forceExit --testTimeout 30000",
@@ -29,9 +29,9 @@
2929
"bh_test": "jest /behavior",
3030
"lint": "eslint $(git ls-files '*.js')",
3131
"lint_md": "mdlint $(git ls-files '[^bucket-scanner/]*.md')",
32-
"start": "node dist/bin/backbeat.js",
33-
"notification_populator": "BACKBEAT_QUEUEPOPULATOR_EXTENSIONS=notification BACKBEAT_QUEUEPOPULATOR_LOGSOURCE=kafka node dist/bin/queuePopulator.js",
34-
"notification_processor": "node dist/extensions/notification/queueProcessor/task.js",
32+
"start": "node bin/backbeat.js",
33+
"notification_populator": "BACKBEAT_QUEUEPOPULATOR_EXTENSIONS=notification BACKBEAT_QUEUEPOPULATOR_LOGSOURCE=kafka node bin/queuePopulator.js",
34+
"notification_processor": "node extensions/notification/queueProcessor/task.js",
3535
"build": "yarn tsc"
3636
},
3737
"repository": {
@@ -45,6 +45,7 @@
4545
},
4646
"homepage": "https://github.com/scality/backbeat#readme",
4747
"dependencies": {
48+
"@types/node": "^18.11.9",
4849
"JSONStream": "^1.3.5",
4950
"arsenal": "git+https://github.com/scality/Arsenal#8.1.76",
5051
"async": "^2.3.0",
@@ -62,6 +63,7 @@
6263
"node-rdkafka": "^2.12.0",
6364
"node-schedule": "^1.2.0",
6465
"node-zookeeper-client": "^1.1.3",
66+
"typescript": "^4.8.4",
6567
"uuid": "^3.1.0",
6668
"vaultclient": "scality/vaultclient#8.3.10",
6769
"werelogs": "scality/werelogs#8.1.2"
@@ -78,13 +80,12 @@
7880
"mocha": "^3.3.0",
7981
"sinon": "^10.0.0",
8082
"ts-jest": "^29.0.3",
81-
"typescript": "^4.8.4",
83+
"ts-node": "^10.9.1",
8284
"zookeeper-mock": "^1.2.0"
8385
},
8486
"jest": {
8587
"maxWorkers": 1,
8688
"testPathIgnorePatterns": [
87-
"/dist/",
8889
"/node_modules/"
8990
],
9091
"preset": "ts-jest",

‎yarn.lock‎

Lines changed: 91 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -475,6 +475,13 @@
475475
resolved "https://registry.yarnpkg.com/@colors/colors/-/colors-1.5.0.tgz#bb504579c1cae923e6576a4f5da43d25f97bdbd9"
476476
integrity sha512-ooWCrlZP11i8GImSjTHYHLkvFDP48nS4+204nGb1RiX/WXYHmJA2III9/e2DWVabCESdW7hBAEzHRqUn9OUVvQ==
477477

478+
"@cspotcode/source-map-support@^0.8.0":
479+
version "0.8.1"
480+
resolved "https://registry.yarnpkg.com/@cspotcode/source-map-support/-/source-map-support-0.8.1.tgz#00629c35a688e05a88b1cda684fb9d5e73f000a1"
481+
integrity sha512-IchNf6dN4tHoMFIn/7OE8LWZ19Y6q/67Bmf6vnGREv8RSbBVb9LPJxEcnwrcwX6ixSvaiGoomAUvu4YSxXrVgw==
482+
dependencies:
483+
"@jridgewell/trace-mapping" "0.3.9"
484+
478485
"@dabh/diagnostics@^2.0.2":
479486
version "2.0.3"
480487
resolved "https://registry.yarnpkg.com/@dabh/diagnostics/-/diagnostics-2.0.3.tgz#7f7e97ee9a725dffc7808d93668cc984e1dc477a"
@@ -836,6 +843,14 @@
836843
resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz#add4c98d341472a289190b424efbdb096991bb24"
837844
integrity sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw==
838845

846+
"@jridgewell/trace-mapping@0.3.9":
847+
version "0.3.9"
848+
resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.9.tgz#6534fd5933a53ba7cbf3a17615e273a0d1273ff9"
849+
integrity sha512-3Belt6tdc8bPgAtbcmdtNJlirVoTmEb5e2gC94PnkwEW9jI6CAHUeoG85tjWP5WquqfavoMtMwiG4P926ZKKuQ==
850+
dependencies:
851+
"@jridgewell/resolve-uri" "^3.0.3"
852+
"@jridgewell/sourcemap-codec" "^1.4.10"
853+
839854
"@jridgewell/trace-mapping@^0.3.12", "@jridgewell/trace-mapping@^0.3.15":
840855
version "0.3.16"
841856
resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.16.tgz#a7982f16c18cae02be36274365433e5b49d7b23f"
@@ -968,6 +983,26 @@
968983
resolved "https://registry.yarnpkg.com/@tootallnate/once/-/once-2.0.0.tgz#f544a148d3ab35801c1f633a7441fd87c2e484bf"
969984
integrity sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A==
970985

986+
"@tsconfig/node10@^1.0.7":
987+
version "1.0.9"
988+
resolved "https://registry.yarnpkg.com/@tsconfig/node10/-/node10-1.0.9.tgz#df4907fc07a886922637b15e02d4cebc4c0021b2"
989+
integrity sha512-jNsYVVxU8v5g43Erja32laIDHXeoNvFEpX33OK4d6hljo3jDhCBDhx5dhCCTMWUojscpAagGiRkBKxpdl9fxqA==
990+
991+
"@tsconfig/node12@^1.0.7":
992+
version "1.0.11"
993+
resolved "https://registry.yarnpkg.com/@tsconfig/node12/-/node12-1.0.11.tgz#ee3def1f27d9ed66dac6e46a295cffb0152e058d"
994+
integrity sha512-cqefuRsh12pWyGsIoBKJA9luFu3mRxCA+ORZvA4ktLSzIuCUtWVxGIuXigEwO5/ywWFMZ2QEGKWvkZG1zDMTag==
995+
996+
"@tsconfig/node14@^1.0.0":
997+
version "1.0.3"
998+
resolved "https://registry.yarnpkg.com/@tsconfig/node14/-/node14-1.0.3.tgz#e4386316284f00b98435bf40f72f75a09dabf6c1"
999+
integrity sha512-ysT8mhdixWK6Hw3i1V2AeRqZ5WfXg1G43mqoYlM2nc6388Fq5jcXyr5mRsqViLx/GJYdoL0bfXD8nmF+Zn/Iow==
1000+
1001+
"@tsconfig/node16@^1.0.2":
1002+
version "1.0.3"
1003+
resolved "https://registry.yarnpkg.com/@tsconfig/node16/-/node16-1.0.3.tgz#472eaab5f15c1ffdd7f8628bd4c4f753995ec79e"
1004+
integrity sha512-yOlFc+7UtL/89t2ZhjPvvB/DeAr3r+Dq58IgzsFkOAvVC6NMJXmCGjbptdXdR9qsX7pKcTL+s87FtYREi2dEEQ==
1005+
9711006
"@types/async@^3.2.12":
9721007
version "3.2.15"
9731008
resolved "https://registry.yarnpkg.com/@types/async/-/async-3.2.15.tgz#26d4768fdda0e466f18d6c9918ca28cc89a4e1fe"
@@ -1055,6 +1090,11 @@
10551090
resolved "https://registry.yarnpkg.com/@types/node/-/node-18.8.5.tgz#6a31f820c1077c3f8ce44f9e203e68a176e8f59e"
10561091
integrity sha512-Bq7G3AErwe5A/Zki5fdD3O6+0zDChhg671NfPjtIcbtzDNZTv4NPKMRFr7gtYPG7y+B8uTiNK4Ngd9T0FTar6Q==
10571092

1093+
"@types/node@^18.11.9":
1094+
version "18.11.9"
1095+
resolved "https://registry.yarnpkg.com/@types/node/-/node-18.11.9.tgz#02d013de7058cea16d36168ef2fc653464cfbad4"
1096+
integrity sha512-CRpX21/kGdzjOpFsZSkcrXMGIBWMGNIHXXBVFSH+ggkftxg+XYP20TESbh+zFvFj3EQOl5byk0HTRn1IL6hbqg==
1097+
10581098
"@types/prettier@^2.1.5":
10591099
version "2.7.1"
10601100
resolved "https://registry.yarnpkg.com/@types/prettier/-/prettier-2.7.1.tgz#dfd20e2dc35f027cdd6c1908e80a5ddc7499670e"
@@ -1254,6 +1294,16 @@ acorn-jsx@^5.3.2:
12541294
resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.2.tgz#7ed5bb55908b3b2f1bc55c6af1653bada7f07937"
12551295
integrity sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==
12561296

1297+
acorn-walk@^8.1.1:
1298+
version "8.2.0"
1299+
resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-8.2.0.tgz#741210f2e2426454508853a2f44d0ab83b7f69c1"
1300+
integrity sha512-k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA==
1301+
1302+
acorn@^8.4.1:
1303+
version "8.8.1"
1304+
resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.8.1.tgz#0a3f9cbecc4ec3bea6f0a80b66ae8dd2da250b73"
1305+
integrity sha512-7zFpHzhnqYKrkYdUjF1HI1bzd0VygEGX8lFk4k5zVMqHEoES+P+7TKI+EvLO9WVMJ8eekdO0aDEK044xTXwPPA==
1306+
12571307
acorn@^8.8.0:
12581308
version "8.8.0"
12591309
resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.8.0.tgz#88c0187620435c7f6015803f5539dae05a9dbea8"
@@ -1377,6 +1427,11 @@ are-we-there-yet@^3.0.0:
13771427
delegates "^1.0.0"
13781428
readable-stream "^3.6.0"
13791429

1430+
arg@^4.1.0:
1431+
version "4.1.3"
1432+
resolved "https://registry.yarnpkg.com/arg/-/arg-4.1.3.tgz#269fc7ad5b8e42cb63c896d5666017261c144089"
1433+
integrity sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA==
1434+
13801435
argparse@^1.0.7:
13811436
version "1.0.10"
13821437
resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911"
@@ -2329,6 +2384,11 @@ core-util-is@~1.0.0:
23292384
resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.3.tgz#a6042d3634c2b27e9328f837b965fac83808db85"
23302385
integrity sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==
23312386

2387+
create-require@^1.1.0:
2388+
version "1.1.1"
2389+
resolved "https://registry.yarnpkg.com/create-require/-/create-require-1.1.1.tgz#c1d7e8f1e5f6cfc9ff65f9cd352d37348756c333"
2390+
integrity sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ==
2391+
23322392
cron-parser@^2.11.0, cron-parser@^2.15.0, cron-parser@^2.18.0:
23332393
version "2.18.0"
23342394
resolved "https://registry.yarnpkg.com/cron-parser/-/cron-parser-2.18.0.tgz#de1bb0ad528c815548371993f81a54e5a089edcf"
@@ -2522,7 +2582,7 @@ diff@3.2.0:
25222582
resolved "https://registry.yarnpkg.com/diff/-/diff-3.2.0.tgz#c9ce393a4b7cbd0b058a725c93df299027868ff9"
25232583
integrity sha512-597ykPFhtJYaXqPq6fF7Vl1fXTKgPdLOntyxpmdzUOKiYGqK7zcnbplj5088+8qJnWdzXhyeau5iVr8HVo9dgg==
25242584

2525-
diff@^4.0.2:
2585+
diff@^4.0.1, diff@^4.0.2:
25262586
version "4.0.2"
25272587
resolved "https://registry.yarnpkg.com/diff/-/diff-4.0.2.tgz#60f3aecb89d5fae520c11aa19efc2bb982aade7d"
25282588
integrity sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==
@@ -5187,7 +5247,7 @@ make-dir@^3.0.0:
51875247
dependencies:
51885248
semver "^6.0.0"
51895249

5190-
make-error@1.x:
5250+
make-error@1.x, make-error@^1.1.1:
51915251
version "1.3.6"
51925252
resolved "https://registry.yarnpkg.com/make-error/-/make-error-1.3.6.tgz#2eb2e37ea9b67c4891f684a1394799af484cf7a2"
51935253
integrity sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==
@@ -7228,6 +7288,25 @@ ts-jest@^29.0.3:
72287288
semver "7.x"
72297289
yargs-parser "^21.0.1"
72307290

7291+
ts-node@^10.9.1:
7292+
version "10.9.1"
7293+
resolved "https://registry.yarnpkg.com/ts-node/-/ts-node-10.9.1.tgz#e73de9102958af9e1f0b168a6ff320e25adcff4b"
7294+
integrity sha512-NtVysVPkxxrwFGUUxGYhfux8k78pQB3JqYBXlLRZgdGUqTO5wU/UyHop5p70iEbGhB7q5KmiZiU0Y3KlJrScEw==
7295+
dependencies:
7296+
"@cspotcode/source-map-support" "^0.8.0"
7297+
"@tsconfig/node10" "^1.0.7"
7298+
"@tsconfig/node12" "^1.0.7"
7299+
"@tsconfig/node14" "^1.0.0"
7300+
"@tsconfig/node16" "^1.0.2"
7301+
acorn "^8.4.1"
7302+
acorn-walk "^8.1.1"
7303+
arg "^4.1.0"
7304+
create-require "^1.1.0"
7305+
diff "^4.0.1"
7306+
make-error "^1.1.1"
7307+
v8-compile-cache-lib "^3.0.1"
7308+
yn "3.1.1"
7309+
72317310
tsconfig-paths@^3.14.1:
72327311
version "3.14.1"
72337312
resolved "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-3.14.1.tgz#ba0734599e8ea36c862798e920bcf163277b137a"
@@ -7520,6 +7599,11 @@ uuid@^8.3.0, uuid@^8.3.2:
75207599
resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.2.tgz#80d5b5ced271bb9af6c445f21a1a04c606cefbe2"
75217600
integrity sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==
75227601

7602+
v8-compile-cache-lib@^3.0.1:
7603+
version "3.0.1"
7604+
resolved "https://registry.yarnpkg.com/v8-compile-cache-lib/-/v8-compile-cache-lib-3.0.1.tgz#6336e8d71965cb3d35a1bbb7868445a7c05264bf"
7605+
integrity sha512-wa7YjyUGfNZngI/vtK0UHAN+lgDCxBPCylVXGp0zu59Fz5aiGtNXaq3DhIov063MorB+VfufLh3JlF2KdTK3xg==
7606+
75237607
v8-to-istanbul@^9.0.1:
75247608
version "9.0.1"
75257609
resolved "https://registry.yarnpkg.com/v8-to-istanbul/-/v8-to-istanbul-9.0.1.tgz#b6f994b0b5d4ef255e17a0d17dc444a9f5132fa4"
@@ -7866,6 +7950,11 @@ yeast@0.1.2:
78667950
resolved "https://registry.yarnpkg.com/yeast/-/yeast-0.1.2.tgz#008e06d8094320c372dbc2f8ed76a0ca6c8ac419"
78677951
integrity sha512-8HFIh676uyGYP6wP13R/j6OJ/1HwJ46snpvzE7aHAN3Ryqh2yX6Xox2B4CUmTwwOIzlG3Bs7ocsP5dZH/R1Qbg==
78687952

7953+
yn@3.1.1:
7954+
version "3.1.1"
7955+
resolved "https://registry.yarnpkg.com/yn/-/yn-3.1.1.tgz#1e87401a09d767c1d5eab26a6e4c185182d2eb50"
7956+
integrity sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q==
7957+
78697958
yocto-queue@^0.1.0:
78707959
version "0.1.0"
78717960
resolved "https://registry.yarnpkg.com/yocto-queue/-/yocto-queue-0.1.0.tgz#0294eb3dee05028d31ee1a5fa2c556a6aaf10a1b"

0 commit comments

Comments
 (0)