go/goreleaser
go/goreleaser
1
0
Fork 0
mirror of https://github.com/goreleaser/goreleaser.git synced 2025-02-05 13:15:26 +02:00
Code Issues Releases Activity

improvements

Browse Source
This commit is contained in:
Carlos Alexandro Becker 2017-09-11 23:42:36 -03:00
parent b9e8ed64d1
commit 60901d31f3
No known key found for this signature in database
GPG Key ID: E61E2F7DC14AB940
4 changed files with 25 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
.goreleaser.yml
View File

@ -13,12 +13,8 @@ builds:
# - arm64
checksum:
name_template: '{{ .ProjectName }}_checksums.txt'
docker:
- goos: linux
goarch: amd64
binary: goreleaser
dockerfile: Dockerfile
image: caarlos0/goreleaser
dockers:
- image: goreleaser/goreleaser
archive:
name_template: '{{ .ProjectName }}_{{ .Os }}_{{ .Arch }}{{ if .Arm }}v{{ .Arm }}{{ end }}'
replacements:

4
config/config.go
View File

@ -183,7 +183,7 @@ type Project struct {
Snapcraft Snapcraft `yaml:",omitempty"`
Snapshot Snapshot `yaml:",omitempty"`
Checksum Checksum `yaml:",omitempty"`
Docker []Docker `yaml:",omitempty"`
Dockers []Docker `yaml:",omitempty"`
// this is a hack ¯\_(ツ)_/¯
SingleBuild Build `yaml:"build,omitempty"`
@ -245,7 +245,7 @@ func checkOverflows(config Project) error {
}
overflow.check(config.Snapshot.XXX, "snapshot")
overflow.check(config.Checksum.XXX, "checksum")
for i, docker := range config.Docker {
for i, docker := range config.Dockers {
overflow.check(docker.XXX, fmt.Sprintf("docker[%d]", i))
}
return overflow.err()

15
pipeline/defaults/defaults.go
View File

@ -57,6 +57,21 @@ func (Pipe) Run(ctx *context.Context) error {
}
ctx.Config.Brew.Install = strings.Join(installs, "\n")
}
if len(ctx.Config.Dockers) == 1 {
if ctx.Config.Dockers[0].Goos == "" {
ctx.Config.Dockers[0].Goos = "linux"
}
if ctx.Config.Dockers[0].Goarch == "" {
ctx.Config.Dockers[0].Goarch = "amd64"
}
if ctx.Config.Dockers[0].Binary == "" {
ctx.Config.Dockers[0].Binary = ctx.Config.Builds[0].Binary
}
if ctx.Config.Dockers[0].Dockerfile == "" {
ctx.Config.Dockers[0].Dockerfile = "Dockerfile"
}
}
err := setArchiveDefaults(ctx)
log.WithField("config", ctx.Config).Debug("defaults set")
return err

16
pipeline/docker/docker.go
View File

@ -25,13 +25,13 @@ func (Pipe) Description() string {
// Run the pipe
func (Pipe) Run(ctx *context.Context) (err error) {
if ctx.Config.Docker[0].Image == "" {
if ctx.Config.Dockers[0].Image == "" {
return pipeline.Skip("docker section is not configured")
}
if ctx.Config.Release.Draft {
return pipeline.Skip("release is marked as draft")
}
for _, docker := range ctx.Config.Docker {
for _, docker := range ctx.Config.Dockers {
var imagePlatform = docker.Goos + docker.Goarch + docker.Goarm
for platform, groups := range ctx.Binaries {
if platform != imagePlatform {
@ -53,14 +53,10 @@ func (Pipe) Run(ctx *context.Context) (err error) {
return nil
}
func processDocker(ctx *context.Context, docker config.Docker) error {
}
func doRun(ctx *context.Context, folder string, docker config.Docker, binary context.Binary) error {
var root = filepath.Join(ctx.Config.Dist, folder)
var dockerfile = filepath.Join(root, "Dockerfile")
var image = fmt.Sprintf("%s:%s", docker.Image, ctx.Version)
var image = fmt.Sprintf("%s:%s", docker.Image, ctx.Git.CurrentTag)
bts, err := ioutil.ReadFile(docker.Dockerfile)
if err != nil {
@ -69,7 +65,7 @@ func doRun(ctx *context.Context, folder string, docker config.Docker, binary con
if err := ioutil.WriteFile(dockerfile, bts, 0755); err != nil {
return err
}
log.WithField("file", dockerfile).Info("wrote dockerfile")
log.WithField("file", dockerfile).Debug("wrote dockerfile")
if err := dockerBuild(root, image); err != nil {
return err
}
@ -83,7 +79,7 @@ func doRun(ctx *context.Context, folder string, docker config.Docker, binary con
}
func dockerBuild(root, image string) error {
log.Infof("building docker image: %s", image)
log.WithField("image", image).Info("building docker image")
var cmd = exec.Command("docker", "build", "-t", image, root)
log.WithField("cmd", cmd).Debug("executing")
out, err := cmd.CombinedOutput()
@ -95,7 +91,7 @@ func dockerBuild(root, image string) error {
}
func dockerPush(image string) error {
log.Infof("pushing docker image: %s", image)
log.WithField("image", image).Info("pushing docker image")
var cmd = exec.Command("docker", "push", image)
log.WithField("cmd", cmd).Debug("executing")
out, err := cmd.CombinedOutput()