Merge pull request #61 from GoogleCloudPlatform/lesv-patch-002

lesv · lesv · commit 93540ed7caba · 2015-07-23T21:24:21.000-07:00
Use ENV in Dockerfile where possible
diff --git a/java/jetty-managed-vm/README.md b/java/jetty-managed-vm/README.md
@@ -81,11 +81,10 @@ This describes a [Jetty](http://www.eclipse.org/jetty/) based [Servlet](http://w
 
  `cd jetty-docker; docker build -t mvm-jetty-v03 .;cd ../bigtable-hello`
 
-1. Edit `src/main/java/com.example.cloud.bigtable.helloworld/BigtableHelper.java` to set `PROJECT_ID`, `CLUSTER_UNIQUE_ID`, and `ZONE` (if necessary) 
+1. Edit `Dockerfile` to set `BIGTABLE_PROJECT`, `BIGTABLE_CLUSTER`, and `BIGTABLE_ZONE` (if necessary) 
 
 1. Edit `src/main/webapp/index.html` to set `google-signin-client_id` 
 
-1. Edit `Dockerfile` and set **`FROM`** to be the recently built `mvm-jetty-v03` image.
 
 1. Copy your keyfile *.json to `src/main/webapp/WEB-INF`
 
diff --git a/java/jetty-managed-vm/bigtable-hello/Dockerfile b/java/jetty-managed-vm/bigtable-hello/Dockerfile
@@ -14,6 +14,10 @@
 
 FROM mvm-jetty-v03
 
+ENV BIGTABLE_PROJECT "PROJECT_ID"
+ENV BIGTABLE_CLUSTER "CLUSTERID"
+ENV BIGTABLE_ZONE    "us-central1-b"
+
 # The below line is only needed if you want to run on your local computer
 # ENV GOOGLE_APPLICATION_CREDENTIALS=/app/WEB-INF/YOUR_KEY_FILE.json
 
diff --git a/java/jetty-managed-vm/bigtable-hello/src/main/java/com.example.cloud.bigtable.helloworld/BigtableHelper.java b/java/jetty-managed-vm/bigtable-hello/src/main/java/com.example.cloud.bigtable.helloworld/BigtableHelper.java
@@ -31,14 +31,10 @@
  *
  **/
 public class BigtableHelper implements ServletContextListener {
-/**
- * You need to set your PROJECT_ID, CLUSTER_UNIQUE_ID (typically 'cluster') here, and if different,
- * your Zone.
- **/
-  private static final String PROJECT_ID = "PROJECT_ID_HERE";
-  private static final String CLUSTER_ID = "CLUSTER_UNIQUE_ID";
 
-  private static final String ZONE = "us-central1-b";
+  private static String PROJECT_ID = System.getenv("BIGTABLE_PROJECT");
+  private static String CLUSTER_ID = System.getenv("BIGTABLE_CLUSTER");
+  private static String ZONE = System.getenv("BIGTABLE_ZONE");
 
 // The initial connection to Cloud Bigtable is an expensive operation -- We cache this Connection
 // to speed things up.  For this sample, keeping them here is a good idea, for
@@ -59,6 +55,12 @@ public static void connect() throws IOException {
     c.set("google.bigtable.endpoint.host", "bigtable.googleapis.com");
     c.set("google.bigtable.admin.endpoint.host", "bigtabletableadmin.googleapis.com");
 
+    if (ZONE == null) ZONE = "us-central1-b"; // default
+    if (PROJECT_ID == null || CLUSTER_ID == null ) {
+      sc.log("environment variables BIGTABLE_PROJECT, BIGTABLE_CLUSTER, and BIGTABLE_ZONE need to be defined.");
+      return;
+    }
+
     c.set("google.bigtable.project.id", PROJECT_ID);
     c.set("google.bigtable.cluster.name", CLUSTER_ID);
     c.set("google.bigtable.zone.name", ZONE);
diff --git a/java/jetty-managed-vm/bigtable-hello/src/main/webapp/index.html b/java/jetty-managed-vm/bigtable-hello/src/main/webapp/index.html
@@ -1,7 +1,7 @@
 <html lang="en">
   <head>
     <meta name="google-signin-scope" content="profile">
-    <meta name="google-signin-client_id" content="YOUR_CLIENT_ID_HERE.apps.googleusercontent.com"> -->
+    <meta name="google-signin-client_id" content="YOUR_CLIENT_ID_HERE.apps.googleusercontent.com" />
     <script src="https://apis.google.com/js/platform.js" async defer'></script>
     <script>
 function obfuscateID(id) {  // Our app just wants something unique, so we obfuscate the ID
diff --git a/java/managed-vm-gae/README.md b/java/managed-vm-gae/README.md
@@ -68,7 +68,7 @@ SECURITY WARNING - This app will read / write the two tables you create (**`gae-
 
  `docker build -t gae-4bt . && cd ../gae-bigtable-hello`
 
-1. Edit `src/main/java/com.example.cloud.bigtable.helloworld/BigtableHelper.java` to set `PROJECT_ID`, `CLUSTER_UNIQUE_ID`, and `ZONE` (if necessary) 
+1. Edit `Dockerfile` to set `BIGTABLE_PROJECT`, `BIGTABLE_CLUSTER`, and `BIGTABLE_ZONE` (if necessary) 
 
 1. Build the java artifacts and docker image
  
diff --git a/java/managed-vm-gae/gae-bigtable-hello/Dockerfile b/java/managed-vm-gae/gae-bigtable-hello/Dockerfile
@@ -14,8 +14,9 @@
 
 FROM gae-4bt
 
-# The below line is only needed if you want to run on your local computer
-# ENV GOOGLE_APPLICATION_CREDENTIALS=/app/WEB-INF/YOUR_KEY_FILE.json
+ENV BIGTABLE_PROJECT "PROJECTID"
+ENV BIGTABLE_CLUSTER "CLUSTERID"
+ENV BIGTABLE_ZONE    "us-central1-b"
 
 ADD target/bigtable-hello-SNAPSHOT/ /app
 
diff --git a/java/managed-vm-gae/gae-bigtable-hello/src/main/java/com.example.cloud.bigtable.helloworld/BigtableHelper.java b/java/managed-vm-gae/gae-bigtable-hello/src/main/java/com.example.cloud.bigtable.helloworld/BigtableHelper.java
@@ -31,14 +31,10 @@
  *
  **/
 public class BigtableHelper implements ServletContextListener {
-/**
- * You need to set your PROJECT_ID, CLUSTER_UNIQUE_ID (typically 'cluster') here, and if different,
- * your Zone.
- **/
-  private static final String PROJECT_ID = "PROJECT_ID_HERE";
-  private static final String CLUSTER_ID = "CLUSTER_UNIQUE_ID";
 
-  private static final String ZONE = "us-central1-b";
+  private static String PROJECT_ID = System.getenv("BIGTABLE_PROJECT");
+  private static String CLUSTER_ID = System.getenv("BIGTABLE_CLUSTER");
+  private static String ZONE = System.getenv("BIGTABLE_ZONE");
 
 // The initial connection to Cloud Bigtable is an expensive operation -- We cache this Connection
 // to speed things up.  For this sample, keeping them here is a good idea, for
@@ -59,6 +55,11 @@ public static void connect() throws IOException {
     c.set("google.bigtable.endpoint.host", "bigtable.googleapis.com");
     c.set("google.bigtable.admin.endpoint.host", "bigtabletableadmin.googleapis.com");
 
+    if (ZONE == null) ZONE = "us-central1-b"; // default
+    if (PROJECT_ID == null || CLUSTER_ID == null ) {
+      sc.log("environment variables BIGTABLE_PROJECT, BIGTABLE_CLUSTER, and BIGTABLE_ZONE need to be defined.");
+      return;
+    }
     c.set("google.bigtable.project.id", PROJECT_ID);
     c.set("google.bigtable.cluster.name", CLUSTER_ID);
     c.set("google.bigtable.zone.name", ZONE);
