Merge branch 'v2.x/staging' into feature/v2/validate-appfw-during-ins…

…tall
zowe · Jun 25, 2024 · d010750 · d010750
2 parents 02fd64c + a2a12b1
commit d010750
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/bin/commands/start/.help b/bin/commands/start/.help
@@ -8,7 +8,8 @@ zowe:
     security:
       stcs:
         zowe: ZWESLSTC
-  jobname: ZWE1SV
+  job:
+    name: ZWE1SV
 haInstances:
   [ha-instance]:
     sysname: ZLP1
@@ -21,3 +22,7 @@ haInstances:
 - `haInstances.[ha-instance].sysname` is the SYSNAME of the target HA instance.
   If you pass `--ha-instance` parameter, this is the SYSNAME the start command
   will be routed to.
+
+Note: `zwe start` is only identifying an already configured instance of Zowe.
+Any additional changes to the `zowe.yaml` config could possibly require
+either manual changes or running related `zwe` commands before issuing `zwe start`.
diff --git a/manifest.json.template b/manifest.json.template
@@ -462,17 +462,17 @@
     "base": {
         "registry": "zowe-docker-release.jfrog.io",
         "name": "ompzowe/base",
-        "tag" : "2.0-ubuntu"
+        "tag" : "2-ubuntu"
     },
     "base-jdk": {
         "registry": "zowe-docker-release.jfrog.io",
         "name": "ompzowe/base-jdk",
-        "tag" : "2.0-ubuntu"
+        "tag" : "2-ubuntu"
     },
     "base-node": {
         "registry": "zowe-docker-release.jfrog.io",
         "name": "ompzowe/base-node",
-        "tag" : "2.0-ubuntu"
+        "tag" : "2-ubuntu"
     }
   },
   "dependencyDecisions": {