Fix bug where env-file variables were not being exposed to detect

sabhiram · Dec 18, 2018 · 88a5253 · 88a5253
1 parent 5ccae5a
commit 88a5253
Show file tree

Hide file tree

Showing 5 changed files with 60 additions and 25 deletions.
diff --git a/acceptance/testdata/mock_buildpacks/printenv/bin/build b/acceptance/testdata/mock_buildpacks/printenv/bin/build
@@ -1,11 +1,11 @@
 #!/usr/bin/env bash
 
-echo "---> Print env buildpack"
+echo "---> BUILD: Printenv buildpack"
 
 set -o errexit
 set -o nounset
 set -o pipefail
 
 for file in $(ls /platform/env); do
-    echo "ENV: $file is $(cat /platform/env/$file);"
+    echo "BUILD: $file is $(cat /platform/env/$file);"
 done
diff --git a/acceptance/testdata/mock_buildpacks/printenv/bin/detect b/acceptance/testdata/mock_buildpacks/printenv/bin/detect
@@ -1,3 +1,13 @@
 #!/usr/bin/env bash
 
+echo "---> DETECT: Printenv buildpack"
+
+set -o errexit
+set -o nounset
+set -o pipefail
+
+for file in $(ls /platform/env); do
+    echo "DETECT: $file is $(cat /platform/env/$file);"
+done
+
 exit 0
diff --git a/build.go b/build.go
@@ -123,15 +123,15 @@ func (bf *BuildFactory) BuildConfigFromFlags(f *BuildFlags) (*BuildConfig, error
 	}
 
 	b := &BuildConfig{
-		AppDir:      appDir,
-		RepoName:    f.RepoName,
-		Publish:     f.Publish,
-		NoPull:      f.NoPull,
-		Buildpacks:  f.Buildpacks,
-		Cli:         bf.Cli,
-		Logger:      bf.Logger,
-		FS:          bf.FS,
-		Config:      bf.Config,
+		AppDir:     appDir,
+		RepoName:   f.RepoName,
+		Publish:    f.Publish,
+		NoPull:     f.NoPull,
+		Buildpacks: f.Buildpacks,
+		Cli:        bf.Cli,
+		Logger:     bf.Logger,
+		FS:         bf.FS,
+		Config:     bf.Config,
 	}
 
 	if f.EnvFile != "" {
@@ -378,6 +378,10 @@ func (b *BuildConfig) Detect() error {
 		}
 	}
 
+	if err := b.copyEnvsToContainer(ctx, ctr.ID); err != nil {
+		return err
+	}
+
 	if err := b.Cli.RunContainer(
 		ctx,
 		ctr.ID,
@@ -493,14 +497,8 @@ func (b *BuildConfig) Build() error {
 		}
 	}
 
-	if len(b.EnvFile) > 0 {
-		platformEnvTar, err := b.tarEnvFile()
-		if err != nil {
-			return errors.Wrap(err, "create env files")
-		}
-		if err := b.Cli.CopyToContainer(ctx, ctr.ID, "/", platformEnvTar, dockertypes.CopyToContainerOptions{}); err != nil {
-			return errors.Wrap(err, "create env files")
-		}
+	if err := b.copyEnvsToContainer(ctx, ctr.ID); err != nil {
+		return err
 	}
 
 	if err = b.Cli.RunContainer(
@@ -556,6 +554,19 @@ func (b *BuildConfig) tarEnvFile() (io.Reader, error) {
 	return bytes.NewReader(buf.Bytes()), nil
 }
 
+func (b *BuildConfig) copyEnvsToContainer(ctx context.Context, containerID string) error {
+	if len(b.EnvFile) > 0 {
+		platformEnvTar, err := b.tarEnvFile()
+		if err != nil {
+			return errors.Wrap(err, "create env files")
+		}
+		if err := b.Cli.CopyToContainer(ctx, containerID, "/", platformEnvTar, dockertypes.CopyToContainerOptions{}); err != nil {
+			return errors.Wrap(err, "create env files")
+		}
+	}
+	return nil
+}
+
 func (b *BuildConfig) Export() error {
 	ctx := context.Background()
 	ctrConf := &container.Config{

diff --git a/build_test.go b/build_test.go
@@ -387,6 +387,22 @@ PATH
 				})
 			})
 		})
+
+		when("EnvFile is specified", func() {
+			it("sets specified env variables in /platform/env/...", func() {
+				if runtime.GOOS == "windows" {
+					t.Skip("directory buildpacks are not implemented on windows")
+				}
+				subject.EnvFile = map[string]string{
+					"VAR1": "value1",
+					"VAR2": "value2 with spaces",
+				}
+				subject.Buildpacks = []string{"acceptance/testdata/mock_buildpacks/printenv"}
+				h.AssertNil(t, subject.Detect())
+				h.AssertContains(t, outBuf.String(), "DETECT: VAR1 is value1;")
+				h.AssertContains(t, outBuf.String(), "DETECT: VAR2 is value2 with spaces;")
+			})
+		})
 	})
 
 	when("#Analyze", func() {
@@ -556,11 +572,9 @@ cache = false
 				}
 				subject.Buildpacks = []string{"acceptance/testdata/mock_buildpacks/printenv"}
 				h.AssertNil(t, subject.Detect())
-
 				h.AssertNil(t, subject.Build())
-
-				h.AssertContains(t, outBuf.String(), "ENV: VAR1 is value1;")
-				h.AssertContains(t, outBuf.String(), "ENV: VAR2 is value2 with spaces;")
+				h.AssertContains(t, outBuf.String(), "BUILD: VAR1 is value1;")
+				h.AssertContains(t, outBuf.String(), "BUILD: VAR2 is value2 with spaces;")
 			})
 		})
 	})

diff --git a/cmd/pack/main.go b/cmd/pack/main.go
@@ -116,7 +116,7 @@ func buildCommandFlags(cmd *cobra.Command, buildFlags *pack.BuildFlags) {
 	cmd.Flags().StringVarP(&buildFlags.AppDir, "path", "p", "", "Path to app dir (defaults to current working directory)")
 	cmd.Flags().StringVar(&buildFlags.Builder, "builder", "", "Builder (defaults to builder configured by 'set-default-builder')")
 	cmd.Flags().StringVar(&buildFlags.RunImage, "run-image", "", "Run image (defaults to default stack's run image)")
-	cmd.Flags().StringVar(&buildFlags.EnvFile, "env-file", "", "Build-time environment variables file\nOne variable per line, of the form 'VAR=VALUE'")
+	cmd.Flags().StringVar(&buildFlags.EnvFile, "env-file", "", "Build-time environment variables file\nOne variable per line, of the form 'VAR=VALUE' or 'VAR'\nWhen using latter value-less form, value will be taken from current\n  environment at the time this command is executed")
 	cmd.Flags().BoolVar(&buildFlags.NoPull, "no-pull", false, "Skip pulling images before use")
 	cmd.Flags().StringSliceVar(&buildFlags.Buildpacks, "buildpack", nil, "Buildpack ID, path to directory, or path/URL to .tgz file"+multiValueHelp("buildpack"))
 }
@@ -417,5 +417,5 @@ func logError(f func(cmd *cobra.Command, args []string) error) func(*cobra.Comma
 }
 
 func multiValueHelp(name string) string {
-	return fmt.Sprintf("\nRepeat for each %s in order,\nor supply once by comma-separated list", name)
+	return fmt.Sprintf("\nRepeat for each %s in order,\n  or supply once by comma-separated list", name)
 }