From 8833ddfbafe3c2ceec00c48855fa63e80d3ec595 Mon Sep 17 00:00:00 2001
From: "Will (Newby) Atlas" <will@deno.com>
Date: Sat, 18 Mar 2023 20:48:28 -0600
Subject: [PATCH] Update to Go 1.20, Taskfile, ghcr.io

---
 Dockerfile    |  6 +++---
 Makefile      |  7 -------
 Taskfile.yaml | 21 +++++++++++++++++++++
 3 files changed, 24 insertions(+), 10 deletions(-)
 delete mode 100644 Makefile
 create mode 100644 Taskfile.yaml

diff --git a/Dockerfile b/Dockerfile
index 4270780..08e98ec 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,3 +1,3 @@
-FROM golang:1.11-alpine
-RUN apk update && apk add drill curl git
-RUN go get -u github.com/rakyll/hey
+FROM golang:1.20-alpine
+RUN apk update && apk add drill curl git openssl
+RUN go install github.com/rakyll/hey@latest
\ No newline at end of file
diff --git a/Makefile b/Makefile
deleted file mode 100644
index c246596..0000000
--- a/Makefile
+++ /dev/null
@@ -1,7 +0,0 @@
-default: build push
-
-build:
-	docker build . -t willnewby/kshell:with-hey
-
-push:
-	docker push willnewby/kshell:with-hey
diff --git a/Taskfile.yaml b/Taskfile.yaml
new file mode 100644
index 0000000..d7e1fd2
--- /dev/null
+++ b/Taskfile.yaml
@@ -0,0 +1,21 @@
+# https://taskfile.dev
+
+version: '3'
+
+vars:
+  DATE: $(date -u -j -f %s $(git show -s --format=%ct) +%Y%m%d%H%M)
+  GITSHA: $(git rev-parse --short HEAD)
+
+tasks:
+  default:
+    cmds:
+    - task: build
+    - task: push
+  build:
+    cmds:
+      - "docker build . -t ghcr.io/willnewby/kshell:{{.DATE}}-{{.GITSHA}}"
+  push:
+    cmds:
+      - "docker push ghcr.io/willnewby/kshell:{{.DATE}}-{{.GITSHA}}"
+
+  
-- 
2.51.2