unify version format

deephaven · Nov 30, 2023 · cfba8dc · cfba8dc
1 parent ae30a5e
commit cfba8dc
Showing 1 changed file with 8 additions and 5 deletions.
diff --git a/web/client-api/types/build.gradle b/web/client-api/types/build.gradle
@@ -10,6 +10,9 @@ dependencies {
     dts project(path: ':web-client-api', configuration: 'dts')
 }
 
+// Apply our temporary convention until dhc hits 1.0.0
+def npmVersion = '1.0.0-dev' + project.property('deephavenBaseVersion').toString().trim()
+
 Docker.registerDockerTask(project, 'typedoc') {
     copyIn {
         from(configurations.dts) {
@@ -29,7 +32,7 @@ Docker.registerDockerTask(project, 'typedoc') {
         from 'deephaven/node:local-build'
 
         copyFile('.', '/project')
-        environmentVariable('VERSION', project.property('deephavenBaseVersion').toString().trim())
+        environmentVariable('VERSION', npmVersion)
 
         runCommand('''set -eux; \\
                       cd /project/; \\
@@ -62,16 +65,16 @@ Docker.registerDockerTask(project, 'versionBump') {
     dockerfile {
         from 'deephaven/node:local-build'
         copyFile('.', '/project')
-        environmentVariable('VERSION', project.property('deephavenBaseVersion').toString().trim())
+        environmentVariable('VERSION', npmVersion)
         runCommand('''set -eux; \\
                       cd /project; \\
                       npm version $VERSION; \\''')
     }
     parentContainers = [ Docker.registryTask(project, 'node') ] // deephaven/node
-    containerOutPath = '/package'
+    containerOutPath = '/project'
     copyOut {
-        from 'package.json'
-        from 'package-lock.json'
+        include 'package.json'
+        include 'package-lock.json'
 
         into layout.projectDirectory
         preserve {