Skip to content

Commit 985cfc0

Browse files
committed
FAB-16207 remove Env from DockerBuildOptions
Change-Id: I10c031c6e255a18d40eafb13d933d61281a7d8a9 Signed-off-by: Matthew Sykes <sykesmat@us.ibm.com>
1 parent 83504ce commit 985cfc0

File tree

1 file changed

+1
-4
lines changed

1 file changed

+1
-4
lines changed

core/chaincode/platforms/util/utils.go

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ var logger = flogging.MustGetLogger("chaincode.platform.util")
2323

2424
type DockerBuildOptions struct {
2525
Image string
26-
Env []string
2726
Cmd string
2827
InputStream io.Reader
2928
OutputStream io.Writer
@@ -47,7 +46,6 @@ type DockerBuildOptions struct {
4746
//
4847
// The input parameters are fairly simple:
4948
// - Image: (optional) The builder image to use or "chaincode.builder"
50-
// - Env: (optional) environment variables for the build environment.
5149
// - Cmd: The command to execute inside the container.
5250
// - InputStream: A tarball of files that will be expanded into /chaincode/input.
5351
// - OutputStream: A tarball of files that will be gathered from /chaincode/output
@@ -77,12 +75,11 @@ func DockerBuild(opts DockerBuildOptions, client *docker.Client) error {
7775
}
7876

7977
//-----------------------------------------------------------------------------------
80-
// Create an ephemeral container, armed with our Env/Cmd
78+
// Create an ephemeral container, armed with our Image/Cmd
8179
//-----------------------------------------------------------------------------------
8280
container, err := client.CreateContainer(docker.CreateContainerOptions{
8381
Config: &docker.Config{
8482
Image: opts.Image,
85-
Env: opts.Env,
8683
Cmd: []string{"/bin/sh", "-c", opts.Cmd},
8784
AttachStdout: true,
8885
AttachStderr: true,

0 commit comments

Comments
 (0)