nodejs: use Docker node version that runs in non-root (#59)

* use node docker tag that runs in node user, not root * set npm config prefix to a dir. accessible by user `node`, so npm link works
googleapis · Sep 5, 2018 · 851e31f · 851e31f
1 parent e5732cc
commit 851e31f
Show file tree

Hide file tree

Showing 12 changed files with 17 additions and 7 deletions.
diff --git a/synthtool/gcp/templates/node_library/.kokoro/common.cfg b/synthtool/gcp/templates/node_library/.kokoro/common.cfg
@@ -16,7 +16,7 @@ build_file: "{{ metadata['repository_name'] }}/.kokoro/trampoline.sh"
 # Configure the docker image for kokoro-trampoline.
 env_vars: {
     key: "TRAMPOLINE_IMAGE"
-    value: "gcr.io/cloud-devrel-kokoro-resources/node:10"
+    value: "gcr.io/cloud-devrel-kokoro-resources/node:10-user"
 }
 env_vars: {
     key: "TRAMPOLINE_BUILD_FILE"

diff --git a/synthtool/gcp/templates/node_library/.kokoro/continuous/node10/common.cfg b/synthtool/gcp/templates/node_library/.kokoro/continuous/node10/common.cfg
@@ -16,7 +16,7 @@ build_file: "{{ metadata['repository_name'] }}/.kokoro/trampoline.sh"
 # Configure the docker image for kokoro-trampoline.
 env_vars: {
     key: "TRAMPOLINE_IMAGE"
-    value: "gcr.io/cloud-devrel-kokoro-resources/node:10"
+    value: "gcr.io/cloud-devrel-kokoro-resources/node:10-user"
 }
 env_vars: {
     key: "TRAMPOLINE_BUILD_FILE"

diff --git a/synthtool/gcp/templates/node_library/.kokoro/continuous/node6/common.cfg b/synthtool/gcp/templates/node_library/.kokoro/continuous/node6/common.cfg
@@ -16,7 +16,7 @@ build_file: "{{ metadata['repository_name'] }}/.kokoro/trampoline.sh"
 # Configure the docker image for kokoro-trampoline.
 env_vars: {
     key: "TRAMPOLINE_IMAGE"
-    value: "gcr.io/cloud-devrel-kokoro-resources/node:6"
+    value: "gcr.io/cloud-devrel-kokoro-resources/node:6-user"
 }
 env_vars: {
     key: "TRAMPOLINE_BUILD_FILE"

diff --git a/synthtool/gcp/templates/node_library/.kokoro/continuous/node8/common.cfg b/synthtool/gcp/templates/node_library/.kokoro/continuous/node8/common.cfg
@@ -16,7 +16,7 @@ build_file: "{{ metadata['repository_name'] }}/.kokoro/trampoline.sh"
 # Configure the docker image for kokoro-trampoline.
 env_vars: {
     key: "TRAMPOLINE_IMAGE"
-    value: "gcr.io/cloud-devrel-kokoro-resources/node:8"
+    value: "gcr.io/cloud-devrel-kokoro-resources/node:8-user"
 }
 env_vars: {
     key: "TRAMPOLINE_BUILD_FILE"

diff --git a/synthtool/gcp/templates/node_library/.kokoro/docs.sh b/synthtool/gcp/templates/node_library/.kokoro/docs.sh
@@ -16,6 +16,8 @@
 
 set -xeo pipefail
 
+export NPM_CONFIG_PREFIX=/home/node/.npm-global
+
 cd $(dirname $0)/..
 
 npm install

diff --git a/synthtool/gcp/templates/node_library/.kokoro/lint.sh b/synthtool/gcp/templates/node_library/.kokoro/lint.sh
@@ -16,6 +16,8 @@
 
 set -xeo pipefail
 
+export NPM_CONFIG_PREFIX=/home/node/.npm-global
+
 cd $(dirname $0)/..
 
 npm install

diff --git a/synthtool/gcp/templates/node_library/.kokoro/presubmit/node10/common.cfg b/synthtool/gcp/templates/node_library/.kokoro/presubmit/node10/common.cfg
@@ -16,7 +16,7 @@ build_file: "{{ metadata['repository_name'] }}/.kokoro/trampoline.sh"
 # Configure the docker image for kokoro-trampoline.
 env_vars: {
     key: "TRAMPOLINE_IMAGE"
-    value: "gcr.io/cloud-devrel-kokoro-resources/node:10"
+    value: "gcr.io/cloud-devrel-kokoro-resources/node:10-user"
 }
 env_vars: {
     key: "TRAMPOLINE_BUILD_FILE"

diff --git a/synthtool/gcp/templates/node_library/.kokoro/presubmit/node6/common.cfg b/synthtool/gcp/templates/node_library/.kokoro/presubmit/node6/common.cfg
@@ -16,7 +16,7 @@ build_file: "{{ metadata['repository_name'] }}/.kokoro/trampoline.sh"
 # Configure the docker image for kokoro-trampoline.
 env_vars: {
     key: "TRAMPOLINE_IMAGE"
-    value: "gcr.io/cloud-devrel-kokoro-resources/node:6"
+    value: "gcr.io/cloud-devrel-kokoro-resources/node:6-user"
 }
 env_vars: {
     key: "TRAMPOLINE_BUILD_FILE"

diff --git a/synthtool/gcp/templates/node_library/.kokoro/presubmit/node8/common.cfg b/synthtool/gcp/templates/node_library/.kokoro/presubmit/node8/common.cfg
@@ -16,7 +16,7 @@ build_file: "{{ metadata['repository_name'] }}/.kokoro/trampoline.sh"
 # Configure the docker image for kokoro-trampoline.
 env_vars: {
     key: "TRAMPOLINE_IMAGE"
-    value: "gcr.io/cloud-devrel-kokoro-resources/node:8"
+    value: "gcr.io/cloud-devrel-kokoro-resources/node:8-user"
 }
 env_vars: {
     key: "TRAMPOLINE_BUILD_FILE"

diff --git a/synthtool/gcp/templates/node_library/.kokoro/samples-test.sh b/synthtool/gcp/templates/node_library/.kokoro/samples-test.sh
@@ -16,6 +16,8 @@
 
 set -xeo pipefail
 
+export NPM_CONFIG_PREFIX=/home/node/.npm-global
+
 # Setup service account credentials.
 export GOOGLE_APPLICATION_CREDENTIALS=${KOKORO_GFILE_DIR}/service-account.json
 export GCLOUD_PROJECT=long-door-651

diff --git a/synthtool/gcp/templates/node_library/.kokoro/system-test.sh b/synthtool/gcp/templates/node_library/.kokoro/system-test.sh
@@ -16,6 +16,8 @@
 
 set -xeo pipefail
 
+export NPM_CONFIG_PREFIX=/home/node/.npm-global
+
 # Setup service account credentials.
 export GOOGLE_APPLICATION_CREDENTIALS=${KOKORO_GFILE_DIR}/service-account.json
 

diff --git a/synthtool/gcp/templates/node_library/.kokoro/test.sh b/synthtool/gcp/templates/node_library/.kokoro/test.sh
@@ -16,6 +16,8 @@
 
 set -xeo pipefail
 
+export NPM_CONFIG_PREFIX=/home/node/.npm-global
+
 cd $(dirname $0)/..
 
 npm install