[Hotfix] Move npm version to dockerfile #3109 (#3110)

* Move npm version to dockerfile Move npm version to dockerfile in rest server and webportal. Fixes #3035, #3100. * Use yarn version Use `yarn version`.
microsoft · Jul 19, 2019 · de797d4 · de797d4
1 parent 1c329b8
commit de797d4
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 3 deletions.
diff --git a/src/rest-server/.gitignore b/src/rest-server/.gitignore
@@ -1,3 +1,6 @@
+# PAI Version directory
+version/
+
 # Directory for submitted jobs' json file and scripts
 frameworklauncher/
 

diff --git a/src/rest-server/build/build-pre.sh b/src/rest-server/build/build-pre.sh
@@ -19,6 +19,6 @@
 
 pushd $(dirname "$0") > /dev/null
 
-npm --no-git-tag-version version $(cat ../../../version/PAI.VERSION)
+cp -arf "../../../version" "../version"
 
 popd > /dev/null
diff --git a/src/rest-server/build/rest-server.dockerfile b/src/rest-server/build/rest-server.dockerfile
@@ -32,6 +32,8 @@ ENV NODE_ENV=production \
 
 COPY . .
 
+RUN yarn --no-git-tag-version --new-version version \
+    "$(cat version/PAI.VERSION)"
 RUN yarn install
 
 RUN dos2unix src/templates/*

diff --git a/src/webportal/.gitignore b/src/webportal/.gitignore
@@ -1,3 +1,6 @@
+# PAI Version directory
+version/
+
 *.zip
 job-docs.md
 job-submit.example.json

diff --git a/src/webportal/build/build-pre.sh b/src/webportal/build/build-pre.sh
@@ -21,7 +21,6 @@ pushd $(dirname "$0") > /dev/null
 
 mkdir -p "../dependency"
 cp -arf "../../../docs" "../../../examples" "../dependency"
-
-npm --no-git-tag-version version $(cat ../../../version/PAI.VERSION)
+cp -arf "../../../version" "../version"
 
 popd > /dev/null
diff --git a/src/webportal/build/webportal.dockerfile b/src/webportal/build/webportal.dockerfile
@@ -25,6 +25,8 @@ ENV NODE_ENV=production \
 COPY dependency/ ../../
 COPY . .
 
+RUN yarn --no-git-tag-version --new-version version \
+    "$(cat version/PAI.VERSION)"
 RUN yarn install
 RUN npm run build