Revert change to "fancy" index.html, update all containers to 512MB f…

…or memory (pulumi#62)
sasikdar · May 24, 2018 · b96553e · b96553e
1 parent 729ad1f
commit b96553e
Show file tree

Hide file tree

Showing 9 changed files with 26 additions and 42 deletions.
diff --git a/aws-js-s3-folder/www/index.html b/aws-js-s3-folder/www/index.html
@@ -1,6 +1,7 @@
-<html><head>
-    <title>Hello S3</title><meta charset="UTF-8">
-    <link rel="shortcut icon" href="/favicon.png" type="image/png">
-</head>
-<body><p>Hello, world!</p><p>Made with ❤️ with <a href="https://pulumi.com">Pulumi</a></p>
+<html>
+    <head><meta charset="UTF-8">
+    <title>Hello, Pulumi!</title></head>
+<body>
+    <p>Hello, S3!</p>
+    <p>Made with ❤️ with <a href="https://pulumi.com">Pulumi</a></p>
 </body></html>
diff --git a/cloud-js-containers/README.md b/cloud-js-containers/README.md
@@ -14,7 +14,7 @@ To run this example, make sure [Docker](https://docs.docker.com/engine/installat
     $ pulumi stack init containers-dev
     ```
 
-1.  Configure Pulumi to use AWS Fargate, which is currently only available in `us-east-1`, `us-west-2`, and `eu-west-1`:
+1.  Configure Pulumi to use AWS Fargate, which is currently only available in `us-east-1`, `us-east-2`, `us-west-2`, and `eu-west-1`:
 
     ```
     $ pulumi config set aws:region us-west-2
@@ -29,7 +29,7 @@ To run this example, make sure [Docker](https://docs.docker.com/engine/installat
     $ pulumi update
     ```
 
-1.  View the endpoint URL, and run curl or view in a browser.
+1.  View the endpoint URL, and run curl:
 
     ```bash
     $ pulumi stack output
@@ -38,14 +38,15 @@ To run this example, make sure [Docker](https://docs.docker.com/engine/installat
         hostname                http://42dc3ff4-ac65d11-86a100b6e1d7f210.elb.us-west-2.amazonaws.com
 
     $ curl $(pulumi stack output hostname)
-      <html>
-          <head>
-          <title>Hello Pulumi</title><meta charset="UTF-8">
-      ...
+    <html>
+        <head><meta charset="UTF-8">
+        <title>Hello, Pulumi!</title></head>
+    <body>
+        <p>Hello, S3!</p>
+        <p>Made with ❤️ with <a href="https://pulumi.com">Pulumi</a></p>
+    </body></html>
     ```
 
-    ![Screenshot of browser](./final-screenshot.png)
-
 1.  To view the runtime logs from the container, use the `pulumi logs` command. To get a log stream, use `pulumi logs --follow`.
 
     ```

diff --git a/cloud-js-containers/app/content/index.html b/cloud-js-containers/app/content/index.html
@@ -1,25 +1,7 @@
 <html>
-    <head>
-    <title>Hello Pulumi</title><meta charset="UTF-8">
-    <link rel="shortcut icon" href="favicon.png" type="image/png">
-
-    <style>
-        body { background: linear-gradient( #7c4792, white); }
-        p.main    { font-size: 2.5em; }
-        p.footer  { font-size: 1em; }
-        div { 
-            font-family: Helvetica, Segoe UI, Arial, sans-serif; 
-            margin: 20px;
-            text-align: center;
-            color: white;
-        }
-    </style>
-</head>
-
+    <head><meta charset="UTF-8">
+    <title>Hello, Pulumi!</title></head>
 <body>
-    <div>
-        <p class="main">Hello, containers!</p>
-        <p class="footer">Made with ❤️ using <a href="https://pulumi.com">Pulumi</a></p>
-    </div>
-</body>
-</html>
+    <p>Hello, containers!</p>
+    <p>Made with ❤️ with <a href="https://pulumi.com">Pulumi</a></p>
+</body></html>
diff --git a/cloud-js-containers/final-screenshot.png b/cloud-js-containers/final-screenshot.png
diff --git a/cloud-js-containers/index.js b/cloud-js-containers/index.js
@@ -4,7 +4,7 @@ let service = new cloud.Service("pulumi-nginx", {
     containers: {
         nginx: {
             build: "./app",
-            memory: 128,
+            memory: 512,
             ports: [{ port: 80 }],
         },
     },

diff --git a/cloud-js-thumbnailer/README.md b/cloud-js-thumbnailer/README.md
@@ -18,7 +18,7 @@ To run this example, make sure [Docker](https://docs.docker.com/engine/installat
     $ pulumi stack init thumbnailer-testing
     ```
 
-1.  Configure Pulumi to use AWS Fargate, which is currently only available in `us-east-1`, `us-west-2`, and `eu-west-1`:
+1.  Configure Pulumi to use AWS Fargate, which is currently only available in `us-east-1`, `us-east-2`, `us-west-2`, and `eu-west-1`:
 
     ```
     $ pulumi config set aws:region us-west-2

diff --git a/cloud-ts-url-shortener-cache/README.md b/cloud-ts-url-shortener-cache/README.md
@@ -16,7 +16,7 @@ A sample URL shortener SPA that uses the high-level `cloud.Table` and `cloud.Htt
     $ pulumi config set cloud:provider aws
     ```
 
-1.  Configure Pulumi to use AWS Fargate, which is currently only available in `us-east-1`, `us-west-2`, and `eu-west-1`:
+1.  Configure Pulumi to use AWS Fargate, which is currently only available in `us-east-1`, `us-east-2`, `us-west-2`, and `eu-west-1`:
 
     ```
     $ pulumi config set aws:region us-west-2

diff --git a/cloud-ts-voting-app/README.md b/cloud-ts-voting-app/README.md
@@ -30,7 +30,7 @@ To use this example, make sure [Docker](https://docs.docker.com/engine/installat
     $ pulumi config set cloud:provider aws
     ```
 
-1.  Configure Pulumi to use AWS Fargate, which is currently only available in `us-east-1`, `us-west-2`, and `eu-west-1`:
+1.  Configure Pulumi to use AWS Fargate, which is currently only available in `us-east-1`, `us-east-2`, `us-west-2`, and `eu-west-1`:
 
     ```
     $ pulumi config set aws:region us-west-2

diff --git a/cloud-ts-voting-app/index.ts b/cloud-ts-voting-app/index.ts
@@ -14,7 +14,7 @@ let redisCache = new cloud.Service("voting-app-cache", {
     containers: {
         redis: {
             image: "redis:alpine",
-            memory: 128,
+            memory: 512,
             ports: [{ port: redisPort }],
             command: ["redis-server", "--requirepass", redisPassword],
         },
@@ -30,7 +30,7 @@ let frontend = new cloud.Service("voting-app-frontend", {
     containers: {
         votingAppFrontend: {
             build: "./frontend",   // path to the folder containing the Dockerfile
-            memory: 128,
+            memory: 512,
             ports: [{ port: 80 }],            
             environment: { 
                 // pass the Redis container info in environment variables