Address review comments

apache · Dec 10, 2024 · ac74cd0 · ac74cd0
1 parent 061ff1c
commit ac74cd0
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 3 deletions.
diff --git a/packages/kogito-db-migrator-tool-image/package.json b/packages/kogito-db-migrator-tool-image/package.json
@@ -13,18 +13,18 @@
     "url": "https://github.com/apache/incubator-kie-tools/issues"
   },
   "scripts": {
-    "build": ". ./node_modules/@kie-tools/python-venv/venv/bin/activate && pnpm copy-assets && pnpm image:build && rimraf build && rimraf target && rimraf dist-tests-e2e && rimraf resources/modules/kogito-postgres-db-migration-deps/quarkus-app",
+    "build": ". ./node_modules/@kie-tools/python-venv/venv/bin/activate && pnpm copy-assets && pnpm image:build && rimraf build && rimraf target && rimraf dist-tests-e2e",
     "build:dev": "run-script-os",
     "build:dev:linux": "pnpm build",
     "build:dev:win32:darwin": "echo \"Build skipped on Windows and MacOS\"",
     "build:prod": "run-script-os",
     "build:prod:linux": "pnpm build",
     "build:prod:win32:darwin": "echo \"Build skipped on Windows and MacOS\"",
     "copy-assets": "run-script-os",
-    "copy-assets:linux:darwin": "rimraf build && cp -R ./node_modules/@kie-tools/sonataflow-image-common/resources build && mkdir -p resources/modules/kogito-postgres-db-migration-deps/quarkus-app && cp -R ./node_modules/@kie-tools/kogito-db-migrator-tool/target/quarkus-app/* resources/modules/kogito-postgres-db-migration-deps/quarkus-app && cp -R resources/* build ",
+    "copy-assets:linux:darwin": "rimraf build && cp -R ./node_modules/@kie-tools/sonataflow-image-common/resources build && cp -R resources/* build && mkdir -p build/modules/kogito-postgres-db-migration-deps/quarkus-app && cp -R ./node_modules/@kie-tools/kogito-db-migrator-tool/target/quarkus-app/* build/modules/kogito-postgres-db-migration-deps/quarkus-app",
     "format": "prettier --write . --ignore-path=../../.prettierignore --ignore-path=../../.gitignore",
     "image:build": "run-script-os",
-    "image:build:linux": "pnpm setup:env && cekit --descriptor build/incubator-kie-kogito-db-migrator-tool-image.yaml -v build docker",
+    "image:build:linux": "pnpm setup:env && make -C ./build build",
     "image:build:win32:darwin": "echo \"Build skipped on Windows and MacOS\"",
     "install": "node install.js && pnpm format",
     "setup:env": ". ./node_modules/@kie-tools/python-venv/venv/bin/activate && cross-env KOGITO_IMAGE_REGISTRY=$(build-env kogitoDbMigratorToolImage.registry) KOGITO_IMAGE_REGISTRY_ACCOUNT=$(build-env kogitoDbMigratorToolImage.account) KOGITO_IMAGE_NAME=$(build-env kogitoDbMigratorToolImage.name) KOGITO_IMAGE_TAG=$(build-env kogitoDbMigratorToolImage.buildTag) QUARKUS_PLATFORM_VERSION=$(build-env versions.quarkus) KOGITO_VERSION=$(build-env versions.kogito)"

diff --git a/.../kogito-db-migrator-tool-image/resources/incubator-kie-kogito-db-migrator-tool-image.yaml b/.../kogito-db-migrator-tool-image/resources/incubator-kie-kogito-db-migrator-tool-image.yaml
@@ -38,6 +38,7 @@ modules:
     - path: modules
   install:
     - name: org.kie.kogito.system.user
+    - name: org.kie.kogito.project.versions
     - name: org.kie.kogito.postgresql.db-migration-deps
 
 run:

diff --git a/...to-db-migrator-tool-image/resources/modules/kogito-postgres-db-migration-deps/module.yaml b/...to-db-migrator-tool-image/resources/modules/kogito-postgres-db-migration-deps/module.yaml
@@ -20,6 +20,7 @@ schema_version: 1
 name: org.kie.kogito.postgresql.db-migration-deps
 version: "main"
 artifacts:
+  # The following artifact comes from the package kogito-db-migrator-tool during the pnpm build:dev phase
   - name: sonataflow-db-migrator-quarkus-app
     path: ./quarkus-app
     dest: /home/kogito/bin
diff --git a/packages/sonataflow-image-common/resources/scripts/build-kogito-apps-components.sh b/packages/sonataflow-image-common/resources/scripts/build-kogito-apps-components.sh
@@ -56,6 +56,9 @@ if [ ! -z "${CYPRESS_BINARY_URL}" ]; then
 fi
 
 case ${imageName} in
+    "incubator-kie-kogito-db-migrator-tool")
+        contextDir="db-migrator-tool/image"
+        ;;
     "incubator-kie-kogito-data-index-ephemeral")
         contextDir="data-index/data-index-service/data-index-service-inmemory"
         ;;