From 7cc9174c8210141eb03631227bee5a54f516793d Mon Sep 17 00:00:00 2001
From: atallison <tanner@atallison.com>
Date: Sun, 31 Jul 2022 23:21:40 -0500
Subject: [PATCH 1/5] Adding `docker-build` and `docker-run` targets to the
 makefile

---
 Makefile | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/Makefile b/Makefile
index aea1299..0ddd255 100644
--- a/Makefile
+++ b/Makefile
@@ -2,6 +2,7 @@ SHELL=/bin/bash -e -o pipefail
 PWD = $(shell pwd)
 GO_BUILD= go build
 GOFLAGS= CGO_ENABLED=0
+REGISTRY_IMAGE_NAME=golang_app
 
 ## help: Print this help message
 .PHONY: help
@@ -40,3 +41,20 @@ fmt:
 .PHONY: build
 build:
 	$(GOFLAGS) $(GO_BUILD) -a -v -ldflags="-w -s" -o bin/app cmd/main.go
+
+## docker-build: Builds a docker image
+.PHONY: docker-build
+docker-build:
+	docker build . -t $(REGISTRY_IMAGE_NAME)
+
+## docker-run: Runs the docker image built by make docker-build
+.PHONY: docker-run
+docker-run:
+	docker run $(REGISTRY_IMAGE_NAME)
+
+## docker: Builds and runs the docker image
+.PHONY: docker
+docker: docker-build docker-run
+
+
+

From c4b6e6c7372eeed80e1681b2c7240667b2af60b6 Mon Sep 17 00:00:00 2001
From: "pre-commit-ci[bot]"
 <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Date: Mon, 1 Aug 2022 04:43:56 +0000
Subject: [PATCH 2/5] [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci
---
 Makefile | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/Makefile b/Makefile
index 0ddd255..148d90a 100644
--- a/Makefile
+++ b/Makefile
@@ -55,6 +55,3 @@ docker-run:
 ## docker: Builds and runs the docker image
 .PHONY: docker
 docker: docker-build docker-run
-
-
-

From 8409a03e0f1a83aac34b6716c4358ae923eb6e7e Mon Sep 17 00:00:00 2001
From: atallison <tanner@atallison.com>
Date: Tue, 2 Aug 2022 22:51:50 -0500
Subject: [PATCH 3/5] Flag container for removal on exit

---
 Makefile | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index 0ddd255..3d1dae2 100644
--- a/Makefile
+++ b/Makefile
@@ -42,17 +42,17 @@ fmt:
 build:
 	$(GOFLAGS) $(GO_BUILD) -a -v -ldflags="-w -s" -o bin/app cmd/main.go
 
-## docker-build: Builds a docker image
+## docker-build: Build a docker image
 .PHONY: docker-build
 docker-build:
 	docker build . -t $(REGISTRY_IMAGE_NAME)
 
-## docker-run: Runs the docker image built by make docker-build
+## docker-run: Run the docker image built via `make docker-build`
 .PHONY: docker-run
 docker-run:
-	docker run $(REGISTRY_IMAGE_NAME)
+	docker run --rm $(DOCKER_REPO)
 
-## docker: Builds and runs the docker image
+## docker: Build and runs the docker image
 .PHONY: docker
 docker: docker-build docker-run
 

From f7fa641c2d2ed0c4693233f397021a7244ae5b0c Mon Sep 17 00:00:00 2001
From: atallison <tanner@atallison.com>
Date: Tue, 2 Aug 2022 22:52:25 -0500
Subject: [PATCH 4/5] Update environment variable name and add DOCKER_TAG for
 versioning

---
 Makefile | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 3d1dae2..d98b680 100644
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,8 @@ SHELL=/bin/bash -e -o pipefail
 PWD = $(shell pwd)
 GO_BUILD= go build
 GOFLAGS= CGO_ENABLED=0
-REGISTRY_IMAGE_NAME=golang_app
+DOCKER_REPO=rog-golang-buddies/template
+DOCKER_TAG=latest
 
 ## help: Print this help message
 .PHONY: help
@@ -45,7 +46,7 @@ build:
 ## docker-build: Build a docker image
 .PHONY: docker-build
 docker-build:
-	docker build . -t $(REGISTRY_IMAGE_NAME)
+	docker build . -t $(DOCKER_REPO):$(DOCKER_TAG)
 
 ## docker-run: Run the docker image built via `make docker-build`
 .PHONY: docker-run

From d856a5e3048d407cf2402e7bb001c3553d0ff904 Mon Sep 17 00:00:00 2001
From: atallison <tanner@atallison.com>
Date: Thu, 4 Aug 2022 23:14:24 -0500
Subject: [PATCH 5/5] Standardize make task descriptions

---
 Makefile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index 6668c10..40a1d8e 100644
--- a/Makefile
+++ b/Makefile
@@ -43,16 +43,16 @@ fmt:
 build:
 	$(GOFLAGS) $(GO_BUILD) -a -v -ldflags="-w -s" -o bin/app cmd/main.go
 
-## docker-build: Build a docker image
+## docker-build: Build docker image
 .PHONY: docker-build
 docker-build:
 	docker build . -t $(DOCKER_REPO):$(DOCKER_TAG)
 
-## docker-run: Run the docker image built via `make docker-build`
+## docker-run: Run docker image built via `make docker-build`
 .PHONY: docker-run
 docker-run:
 	docker run --rm $(DOCKER_REPO)
 
-## docker: Build and runs the docker image
+## docker: Build and run docker image
 .PHONY: docker
 docker: docker-build docker-run