diff --git a/push.go b/push.go index f840fa7..611d0cb 100644 --- a/push.go +++ b/push.go @@ -24,6 +24,14 @@ func pushCommand() *cobra.Command { return err } + svcPath := cfg.ServicePath(svc) + + version, err := runOutput(svcPath, "git", "describe", "--tags", "--always", "--dirty") + if err != nil { + return fmt.Errorf("git describe in %s: %w", svcPath, err) + } + fmt.Printf("Version: %s\n", version) + images := svc.Images if imageFlag != "" { images = []string{imageFlag} @@ -31,11 +39,19 @@ func pushCommand() *cobra.Command { var pushed []string for _, image := range images { - ref := cfg.ImageRef(image) + ":latest" - if err := run("podman", "push", ref); err != nil { - return fmt.Errorf("push %s: %w", image, err) + ref := cfg.ImageRef(image) + tagLatest := ref + ":latest" + tagVersion := ref + ":" + version + + if err := run("podman", "push", tagLatest); err != nil { + return fmt.Errorf("push %s:latest: %w", image, err) } - pushed = append(pushed, ref) + pushed = append(pushed, tagLatest) + + if err := run("podman", "push", tagVersion); err != nil { + return fmt.Errorf("push %s:%s: %w", image, version, err) + } + pushed = append(pushed, tagVersion) } fmt.Printf("\nPushed %d image(s):\n", len(pushed))