From be40c3b031eb7682e5dd8fdf1d3317566b73054b Mon Sep 17 00:00:00 2001
From: Marc Guasch <marc.guasch@elastic.co>
Date: Fri, 28 May 2021 12:02:40 +0200
Subject: [PATCH] Various Makefile fixes

---
 Makefile           | 11 ++++-------
 command/root.go    |  5 +++--
 pkg/output/util.go |  3 ++-
 3 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/Makefile b/Makefile
index 387a1bb..ba5883a 100644
--- a/Makefile
+++ b/Makefile
@@ -1,19 +1,16 @@
 LICENSE := ASL2-Short
-VERSION ?= latest
+VERSION ?= local
 
 check-fmt: goimports go-licenser
 	@go-licenser -d -license ${LICENSE}
-	@goimports -l -e -local github.com/andrewkroh . | read && echo "Code differs from gofmt's style. Run 'gofmt -w .'" 1>&2 && exit 1 || true
+	@goimports -l -e -local github.com/elastic . | read && echo "Code differs from gofmt's style. Run 'gofmt -w .'" 1>&2 && exit 1 || true
 
 docker:
-	docker build -t akroh/stream:${VERSION} .
-
-publish: docker
-	docker push akroh/stream:${VERSION}
+	docker build -t docker.elastic.co/observability/stream:${VERSION} .
 
 fmt: goimports go-licenser
 	go-licenser -license ${LICENSE}
-	goimports -l -w -local github.com/andrewkroh .
+	goimports -l -w -local github.com/elastic .
 
 goimports:
 	GO111MODULE=off go get golang.org/x/tools/cmd/goimports
diff --git a/command/root.go b/command/root.go
index 0cdb26e..253b668 100644
--- a/command/root.go
+++ b/command/root.go
@@ -12,14 +12,15 @@ import (
 	"strings"
 	"time"
 
-	"github.com/elastic/go-concert/ctxtool/osctx"
-	"github.com/elastic/go-concert/timed"
 	"github.com/spf13/cobra"
 	"github.com/spf13/pflag"
 	"go.uber.org/multierr"
 	"go.uber.org/zap"
 	"golang.org/x/sys/unix"
 
+	"github.com/elastic/go-concert/ctxtool/osctx"
+	"github.com/elastic/go-concert/timed"
+
 	"github.com/elastic/stream/pkg/log"
 	"github.com/elastic/stream/pkg/output"
 
diff --git a/pkg/output/util.go b/pkg/output/util.go
index 4816914..06dfc25 100644
--- a/pkg/output/util.go
+++ b/pkg/output/util.go
@@ -8,8 +8,9 @@ import (
 	"context"
 	"time"
 
-	"github.com/elastic/go-concert/timed"
 	"go.uber.org/zap"
+
+	"github.com/elastic/go-concert/timed"
 )
 
 func Initialize(opts *Options, logger *zap.SugaredLogger, ctx context.Context) (Output, error) {