Merge pull request #801 from GoogleCloudPlatform/gcloud

Added back support for mapping in gcloud config. This is not used by …

containers/datalab/Dockerfile.in

@@ -81,13 +81,10 @@ RUN wget -nv https://dl.google.com/dl/cloudsdk/release/google-cloud-sdk.zip && \
         component_manager/fixed_sdk_version 102.0.0 && \
     tools/google-cloud-sdk/bin/gcloud -q components update \
         gcloud core bq gsutil compute preview alpha beta && \
-    rm -rf /root/.config/* && \
-    ln -s /root/.config /config && \
     touch /tools/google-cloud-sdk/lib/third_party/google.py
 
 # Container configuration
 EXPOSE 8080
-VOLUME [ "/notebooks" ]
 
 # Path configuration
 ENV PATH $PATH:/tools/node/bin:/tools/google-cloud-sdk/bin

containers/datalab/content/run-debug.sh

@@ -15,16 +15,6 @@
 
 # Runs the docker container locally.
 
-# We use the presence of /root/.config to tell whether to show landing page.
-# Running gcloud will create it in whatever volume we mapped in which may
-# not be the user's home, so we guard against calling gcloud below unless
-# it already exists.
-if [ -d /root/.config/gcloud ]
-then
-  PROJECT_ID=`gcloud -q config list --format yaml | grep project | awk -F" " '{print $2}'`
-  export DATALAB_PROJECT_NUM=`gcloud -q projects describe $PROJECT_ID | grep projectNumber | awk '{print substr($2,2,length($2)-2)}'`
-fi
-
 export DATALAB_INSTANCE_NAME=debug
 export DATALAB_ENV=local
 

containers/datalab/content/run.sh

@@ -15,16 +15,6 @@
 
 # Runs the docker container locally.
 
-# We use the presence of /root/.config to tell whether to show landing page.
-# Running gcloud will create it in whatever volume we mapped in which may
-# not be the user's home, so we guard against calling gcloud below unless
-# it already exists.
-if [ -d /root/.config/gcloud ]
-then
-  PROJECT_ID=`gcloud -q config list --format yaml | grep project | awk -F" " '{print $2}'`
-  export DATALAB_PROJECT_NUM=`gcloud -q projects describe $PROJECT_ID | grep projectNumber | awk '{print substr($2,2,length($2)-2)}'`
-fi
-
 export DATALAB_INSTANCE_NAME=local
 export DATALAB_ENV=local
 

containers/datalab/run.sh

@@ -35,6 +35,7 @@ fi
 
 docker run -it --entrypoint=$ENTRYPOINT \
   -p 8081:8080 \
+  -v "$HOME/.config:/root/.config" \
   -v "$CONTENT:/content" \
   -e "PROJECT_ID=$PROJECT_ID" \
   datalab

sources/lib/api/gcp/context/_credentials.py

@@ -22,7 +22,7 @@ class Credentials(oauth2client.client.OAuth2Credentials):
   """OAuth credentials using auth tokens.
   """
 
-  _NODE_TOKEN_FILE = '/datalab/tokens.json'
+  _NODE_TOKEN_FILE = '/root/tokens.json'
 
   def _get_token(self):
     try:

sources/web/datalab/common.d.ts

@@ -33,12 +33,6 @@ declare module common {
      */
     instanceUser: string;
 
-    /**
-     * Id of the cloud project that the datalab instance runs in.
-     */
-    projectId: string;
-    projectNumber: string;
-
     release: string;
     versionId: string;
     instanceId: string;

sources/web/datalab/jupyter.ts

@@ -287,8 +287,6 @@ function responseHandler(proxyResponse: http.ClientResponse,
   if ((path.indexOf('/tree') == 0) || (path.indexOf('/notebooks') == 0)) {
     var templateData: common.Map<string> = {
       feedbackId: appSettings.feedbackId,
-      projectNumber: appSettings.projectNumber,
-      projectId: appSettings.projectId,
       versionId: appSettings.versionId,
       instanceId: appSettings.instanceId,
       instanceName: appSettings.instanceName,

sources/web/datalab/server.ts

@@ -53,9 +53,9 @@ let scopes = [
 ];
 
 // Datalab config file for things like default project. If this doesn't exist the EULA hasn't been accepted.
-let configFile = '/notebooks/.datalabconfig';
+let configFile = '/root/.config/datalab';
 
-let tokensFile = '/datalab/tokens.json';  // Where we store credentials.
+let tokensFile = '/root/tokens.json';  // Where we store credentials.
 
 /**
  * The application settings instance.

sources/web/datalab/settings.ts

@@ -59,10 +59,7 @@ export function loadSettings(): common.Settings {
     settings.instanceId = metadata.instanceId;
     settings.instanceName = process.env['DATALAB_INSTANCE_NAME'] || '';
     settings.instanceUser = process.env['DATALAB_USER'] || '';
-    settings.projectId = process.env['DATALAB_PROJECT_ID'] || '';
-    settings.projectNumber = process.env['DATALAB_PROJECT_NUM'] || '';
     settings.versionId = process.env['DATALAB_VERSION'] || '';
-    settings.metadataHost = process.env['METADATA_HOST'] || 'metadata.google.internal';
     if (process.env['DATALAB_CONFIG_URL']) {
       settings.configUrl = process.env['DATALAB_CONFIG_URL'];
     }

sources/web/datalab/templates/nb.html

@@ -17,8 +17,6 @@
   data-notebook-name="<%notebookName%>"
   data-notebook-path="<%notebookPath%>"
   data-feedback-id="<%feedbackId%>"
-  data-project-num="<%projectNumber%>"
-  data-project-id="<%projectId%>"
   data-version-id="<%versionId%>"
   data-instance-id="<%instanceId%>"
   data-instance-name="<%instanceName%>"

sources/web/datalab/templates/tree.html

@@ -15,8 +15,6 @@
   data-notebook-path="<%notebookPath%>"
   data-terminals-available="False"
   data-feedback-id="<%feedbackId%>"
-  data-project-num="<%projectNumber%>"
-  data-project-id="<%projectId%>"
   data-version-id="<%versionId%>"
   data-instance-id="<%instanceId%>"
   data-instance-name="<%instanceName%>"

sources/web/datalab/updateDocs.ts

@@ -38,6 +38,7 @@ export function startUpdate(settings: common.Settings) {
     childProcess.execSync('rm -r -f ' + docsDownloadDir, {env: process.env});
   }
   fs.mkdirSync(docsDownloadDir);
+  // TODO(gram): must replace this with a git clone.
   var downloadCommand = 'gsutil -m cp -r ' + docsSourceGcsPath + ' ' + docsDownloadDir;
   childProcess.exec(downloadCommand, {env: process.env}, function(err, stdout, stderr) {
     if (err) {