From 743eebcd238fa8df387563b8e215dd999a970c26 Mon Sep 17 00:00:00 2001
From: Adam Veldhousen <adamveld12@gmail.com>
Date: Fri, 27 Jan 2023 20:23:45 -0600
Subject: [PATCH] more make cleanup

---
 .dockerignore | 10 ++++++++++
 .gitignore    |  1 +
 Dockerfile    |  4 ++--
 Makefile      | 21 ++++++++++-----------
 4 files changed, 23 insertions(+), 13 deletions(-)
 create mode 100644 .dockerignore

diff --git a/.dockerignore b/.dockerignore
new file mode 100644
index 0000000..6e8eaee
--- /dev/null
+++ b/.dockerignore
@@ -0,0 +1,10 @@
+public
+resources
+themes
+
+# generated by hugo gen
+assets/css/syntax.light.css
+assets/css/syntax.dark.css
+
+# generated by openring
+layouts/partials/footer.html
diff --git a/.gitignore b/.gitignore
index c86ed24..6e8eaee 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,6 @@
 public
 resources
+themes
 
 # generated by hugo gen
 assets/css/syntax.light.css
diff --git a/Dockerfile b/Dockerfile
index 93f5b77..bafa20f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,7 +1,7 @@
 FROM golang:1.19 as build
 
-ENV GOPATH=/go
-ENV GOBIN=/go/bin
+RUN go install git.sr.ht/~sircmpwn/openring@latest
+RUN go install --tags extended github.com/gohugoio/hugo@latest
 
 COPY . /go/src/blog
 WORKDIR /go/src/blog
diff --git a/Makefile b/Makefile
index e0cf087..d2fb518 100644
--- a/Makefile
+++ b/Makefile
@@ -3,11 +3,11 @@ GOBIN = $(shell go env GOPATH)/bin
 
 .PHONY: serve
 serve: assets
-	hugo server -D --log -w --bind 0.0.0.0
+	$(HUGO_BIN) server -D --log -w --bind 0.0.0.0
 
 .PHONY: new-post
 new-post:
-	@hugo new posts/$(TITLE).md
+	@$(HUGO_BIN) new posts/$(TITLE).md
 
 .PHONY: build
 build:
@@ -25,6 +25,9 @@ test-publish: build
 clean:
 	@rm -rf ./public ./resources ./assets/css/syntax.* ./layouts/partials/single/footer.html
 
+.PHONY: tools
+tools: $(HUGO_BIN) $(OPENRING_BIN)
+
 HUGO_BIN = $(GOBIN)/hugo
 $(HUGO_BIN):
 	@go install --tags extended github.com/gohugoio/hugo@latest
@@ -33,24 +36,20 @@ OPENRING_BIN = $(GOBIN)/openring
 $(OPENRING_BIN):
 	@go install git.sr.ht/~sircmpwn/openring@latest
 
-public: $(HUGO_BIN) \
-		./themes\lines \
-		./assets/css/syntax.light.css \
-		./assets/css/syntax.dark.css \
-		./layouts/partials/single/footer.html
-	hugo --verbose --gc --minify --templateMetrics --templateMetricsHints --enableGitInfo --environment production 
+public: $(HUGO_BIN) ./themes/lines ./assets/css/syntax.light.css ./assets/css/syntax.dark.css ./layouts/partials/single/footer.html
+	$(HUGO_BIN) --verbose --gc --minify --templateMetrics --templateMetricsHints --enableGitInfo --environment production 
 
 ./themes/lines:
-	git submodule init
+	git submodule update
 
 ./assets/css:
 	mkdir -p ./assets/css
 
 ./assets/css/syntax.light.css: $(HUGO_BIN) ./assets/css
-	hugo gen chromastyles --style=github > assets/css/syntax.light.css
+	$(HUGO_BIN) gen chromastyles --style=github > assets/css/syntax.light.css
 
 ./assets/css/syntax.dark.css: $(HUGO_BIN) ./assets/css
-	hugo gen chromastyles --style=github-dark > assets/css/syntax.dark.css
+	$(HUGO_BIN) gen chromastyles --style=github-dark > assets/css/syntax.dark.css
 
 ./layouts/partials/single/footer.html: $(OPENRING_BIN)
 	mkdir -p ./layouts/partials/single/