From b23d96901e041945be43a3e0b1aec30e270813b4 Mon Sep 17 00:00:00 2001
From: yeshamavani <83634146+yeshamavani@users.noreply.github.com>
Date: Fri, 8 Dec 2023 17:33:37 +0530
Subject: [PATCH] fix(cli): update the migration scripts and docker build
 (#1835)

* fix(cli): update the migration scripts as per workspaces

gh-1832

* fix(cli): update the migration scripts as per workspaces

gh-1834

* fix(cli): change migration scripts

gh-1834
---
 packages/cli/src/generators/microservice/index.ts      | 10 +++++-----
 .../src/generators/scaffold/templates/package.json.tpl |  4 +++-
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/packages/cli/src/generators/microservice/index.ts b/packages/cli/src/generators/microservice/index.ts
index c4217fa5b4..531fe2f612 100644
--- a/packages/cli/src/generators/microservice/index.ts
+++ b/packages/cli/src/generators/microservice/index.ts
@@ -199,16 +199,16 @@ export default class MicroserviceGenerator extends AppGenerator<MicroserviceOpti
         'node -r ./dist/opentelemetry-registry.js -r source-map-support/register .';
       scripts[
         'docker:build'
-      ] = `DOCKER_BUILDKIT=1 sudo docker build --build-arg NR_ENABLED=$NR_ENABLED_VALUE -t $IMAGE_REPO_NAME/${this.options.uniquePrefix}-$npm_package_name:$npm_package_version .`;
+      ] = `DOCKER_BUILDKIT=1 sudo docker build --build-arg NR_ENABLED=$NR_ENABLED_VALUE -t $IMAGE_REPO_NAME/$npm_package_name:$npm_package_version .`;
       scripts[
         'docker:push'
-      ] = `sudo docker push $IMAGE_REPO_NAME/${this.options.uniquePrefix}-$npm_package_name:$npm_package_version`;
+      ] = `sudo docker push $IMAGE_REPO_NAME/$npm_package_name:$npm_package_version`;
       scripts[
         'docker:build:dev'
-      ] = `DOCKER_BUILDKIT=1 sudo docker build --build-arg NR_ENABLED=$NR_ENABLED_VALUE -t $IMAGE_REPO_NAME/${this.options.uniquePrefix}-$npm_package_name:$IMAGE_TAG_VERSION .`;
+      ] = `DOCKER_BUILDKIT=1 sudo docker build --build-arg NR_ENABLED=$NR_ENABLED_VALUE -t $IMAGE_REPO_NAME/$npm_package_name:$IMAGE_TAG_VERSION .`;
       scripts[
         'docker:push:dev'
-      ] = `sudo docker push $IMAGE_REPO_NAME/${this.options.uniquePrefix}-$npm_package_name:$IMAGE_TAG_VERSION`;
+      ] = `sudo docker push $IMAGE_REPO_NAME/$npm_package_name:$IMAGE_TAG_VERSION`;
       scripts['coverage'] = 'nyc npm run test';
 
       packageJson.scripts = scripts;
@@ -230,7 +230,7 @@ export default class MicroserviceGenerator extends AppGenerator<MicroserviceOpti
       await this.spawnCommand('npm', ['i']);
 
       await this.addMigrations();
-      this._appendDockerScript();
+      // this._appendDockerScript();
       return true;
     }
     return false;
diff --git a/packages/cli/src/generators/scaffold/templates/package.json.tpl b/packages/cli/src/generators/scaffold/templates/package.json.tpl
index 922cd098bb..4a3690e60e 100644
--- a/packages/cli/src/generators/scaffold/templates/package.json.tpl
+++ b/packages/cli/src/generators/scaffold/templates/package.json.tpl
@@ -4,7 +4,9 @@
   "private": true,
   "scripts": {
     "prepare": "husky install",
-    "test": "lerna run test"
+    "test": "lerna run test",
+     "migrate": "npm run db:migrate --workspaces --if-present",
+     "build": "npm run build --workspaces --if-present"
   },
   "devDependencies": {
     "@commitlint/cli": "^16.1.0",