Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: add BuuildArgs to BuildOptions #243

Merged
merged 1 commit into from Dec 3, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 2 additions & 0 deletions dockertest.go
Expand Up @@ -306,6 +306,7 @@ type RunOptions struct {
type BuildOptions struct {
Dockerfile string
ContextDir string
BuildArgs []dc.BuildArg
}

// BuildAndRunWithBuildOptions builds and starts a docker container.
Expand All @@ -316,6 +317,7 @@ func (d *Pool) BuildAndRunWithBuildOptions(buildOpts *BuildOptions, runOpts *Run
Dockerfile: buildOpts.Dockerfile,
OutputStream: ioutil.Discard,
ContextDir: buildOpts.ContextDir,
BuildArgs: buildOpts.BuildArgs,
})

if err != nil {
Expand Down
41 changes: 41 additions & 0 deletions dockertest_test.go
Expand Up @@ -141,6 +141,47 @@ func TestBuildImage(t *testing.T) {
require.Nil(t, pool.Purge(resource))
}

func TestBuildImageWithBuildArg(t *testing.T) {
// Create Dockerfile in temp dir
dir, _ := ioutil.TempDir("", "dockertest")
defer os.RemoveAll(dir)

dockerfilePath := dir + "/Dockerfile"
ioutil.WriteFile(dockerfilePath,
[]byte((`FROM busybox
ARG foo
RUN echo -n $foo > /build-time-value
CMD sleep 10
`)),
0644,
)

resource, err := pool.BuildAndRunWithBuildOptions(
&BuildOptions{
ContextDir: dir,
Dockerfile: "Dockerfile",
BuildArgs: []dc.BuildArg{
{Name: "foo", Value: "bar"},
},
},
&RunOptions{
Name: "buildarg-test",
}, func(hc *dc.HostConfig) {
hc.AutoRemove = true
})
require.Nil(t, err)

var stdout bytes.Buffer
exitCode, err := resource.Exec(
[]string{"cat", "/build-time-value"},
ExecOptions{StdOut: &stdout},
)
require.Nil(t, err)
require.Zero(t, exitCode)
require.Equal(t, stdout.String(), "bar")
require.Nil(t, pool.Purge(resource))
}

func TestExpire(t *testing.T) {
resource, err := pool.Run("postgres", "9.5", nil)
require.Nil(t, err)
Expand Down