Merge pull request #19 from kopachevsky/feature/added-docker-env-section

added container env section

Author: aaron-lane

.gitignore

@@ -5,3 +5,4 @@ test/fixtures/**/terraform.tfstate.d
 test/fixtures/**/ssh/key
 *.pyc
 test/fixtures/shared/terraform.tfvars
+.idea

CHANGELOG.md

@@ -8,6 +8,10 @@ Extending the adopted spec, each change should have a link to its corresponding
 
 ## [Unreleased]
 
+### Added
+
+- added docker environment variables section example  [#19]
+
 ## [0.1.1]
 
 ### Fixed
@@ -22,4 +26,5 @@ Extending the adopted spec, each change should have a link to its corresponding
 [Unreleased]: https://github.com/terraform-google-modules/terraform-google-container-vm/compare/v0.1.1...HEAD
 [0.1.1]: https://github.com/terraform-google-modules/terraform-google-container-vm/compare/v0.1.0...v0.1.1
 
+[#19]: https://github.com/terraform-google-modules/terraform-google-container-vm/pull/19
 [#17]: https://github.com/terraform-google-modules/terraform-google-container-vm/pull/17

README.md

@@ -13,7 +13,12 @@ module "gce-container" {
 
   container = {
     image="gcr.io/google-samples/hello-app:1.0"
-
+    env = [
+      {
+        name = "TEST_VAR"
+        value = "Hello World!"
+      }
+    ],
     volumeMounts = [
       {
         mountPath = "/cache"

examples/instance_with_attached_disk/main.tf

@@ -24,6 +24,13 @@ module "gce-container" {
   container = {
     image = "${var.image}"
 
+    env = [
+      {
+        name  = "TEST_VAR"
+        value = "Hello World!"
+      },
+    ]
+
     volumeMounts = [
       {
         mountPath = "/cache"

examples/simple_instance/main.tf

@@ -34,6 +34,13 @@ module "gce-container" {
   container = {
     image = "gcr.io/google-samples/hello-app:1.0"
 
+    env = [
+      {
+        name  = "TEST_VAR"
+        value = "Hello World!"
+      },
+    ]
+
     volumeMounts = [
       {
         mountPath = "/cache"

test/integration/instance_with_attached_disk/controls/gce.rb

@@ -59,12 +59,13 @@
       expect(data['labels']['container-vm']).to eq vm_container_label
     end
 
-    it "is configured with the expected container(s), volumes, and restart policy" do
+    it "is configured with the expected container(s), volumes, env and restart policy" do
       expect(container_declaration).to eq({
         "spec" => {
           "containers" => [
             {
               "image" => "gcr.io/google-samples/hello-app:1.0",
+              "env"=>[{"name"=>"TEST_VAR", "value"=>"Hello World!"}],
               "volumeMounts" => [
                 {
                   "mountPath" => "/cache",

test/integration/simple_instance/controls/gce.rb

@@ -59,11 +59,12 @@
       expect(data['labels']['container-vm']).to eq vm_container_label
     end
 
-    it "is configured with the expected container(s), volumes, and restart policy" do
+    it "is configured with the expected container(s), volumes, env and restart policy" do
       expect(container_declaration).to eq({
         "spec" => {
           "containers" => [
             {
+              "env"=>[{"name"=>"TEST_VAR", "value"=>"Hello World!"}],
               "image" => "gcr.io/google-samples/hello-app:1.0",
               "volumeMounts" => [
                 {