go/goreleaser
go/goreleaser
1
0
Fork 0
mirror of https://github.com/goreleaser/goreleaser.git synced 2025-01-10 03:47:03 +02:00
Code Issues Releases Activity

Merge pull request #358 from goreleaser/docker-snapshot

Browse Source 
fixed docker version name when snapshots
This commit is contained in:
Carlos Alexandro Becker 2017-09-14 20:15:18 -03:00 committed by GitHub
commit 250e78dc2a
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pipeline/docker/docker.go
View File

@ -61,7 +61,7 @@ func (Pipe) Run(ctx *context.Context) error {
func doRun(ctx *context.Context, folder string, docker config.Docker, binary context.Binary) error { func doRun(ctx *context.Context, folder string, docker config.Docker, binary context.Binary) error {
var root = filepath.Join(ctx.Config.Dist, folder) var root = filepath.Join(ctx.Config.Dist, folder)
var dockerfile = filepath.Join(root, filepath.Base(docker.Dockerfile)) var dockerfile = filepath.Join(root, filepath.Base(docker.Dockerfile))
var image = fmt.Sprintf("%s:%s", docker.Image, ctx.Git.CurrentTag) var image = fmt.Sprintf("%s:%s", docker.Image, ctx.Version)
if err := os.Link(docker.Dockerfile, dockerfile); err != nil { if err := os.Link(docker.Dockerfile, dockerfile); err != nil {
return errors.Wrap(err, "failed to link dockerfile") return errors.Wrap(err, "failed to link dockerfile")

8
pipeline/docker/docker_test.go
View File

@ -27,9 +27,7 @@ func TestRunPipe(t *testing.T) {
// this might fail as the image doesnt exist yet, so lets ignore the error // this might fail as the image doesnt exist yet, so lets ignore the error
_ = exec.Command("docker", "rmi", "goreleaser/test_run_pipe:v1.0.0").Run() _ = exec.Command("docker", "rmi", "goreleaser/test_run_pipe:v1.0.0").Run()
var ctx = &context.Context{ var ctx = &context.Context{
Git: context.GitInfo{ Version: "1.0.0",
CurrentTag: "v1.0.0",
},
Publish: true, Publish: true,
Config: config.Project{ Config: config.Project{
ProjectName: "mybin", ProjectName: "mybin",
@ -59,12 +57,12 @@ func TestRunPipe(t *testing.T) {
// this might should not fail as the image should have been created when // this might should not fail as the image should have been created when
// the step ran // the step ran
assert.NoError( assert.NoError(
exec.Command("docker", "rmi", "goreleaser/test_run_pipe:v1.0.0").Run(), exec.Command("docker", "rmi", "goreleaser/test_run_pipe:1.0.0").Run(),
) )
// the test_run_pipe_nope image should not have been created, so deleting // the test_run_pipe_nope image should not have been created, so deleting
// it should fail // it should fail
assert.Error( assert.Error(
exec.Command("docker", "rmi", "goreleaser/test_run_pipe_nope:v1.0.0").Run(), exec.Command("docker", "rmi", "goreleaser/test_run_pipe_nope:1.0.0").Run(),
) )
} }