From ea590afee5589415e9b6df192629a14c79e3241b Mon Sep 17 00:00:00 2001 From: Adam Veldhousen Date: Fri, 27 Jan 2023 22:48:44 -0600 Subject: [PATCH] some more tweaks --- Dockerfile | 4 ++-- Makefile | 16 +++++----------- 2 files changed, 7 insertions(+), 13 deletions(-) diff --git a/Dockerfile b/Dockerfile index ae84dda..6889643 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ -FROM docker.io/golang:1.19 as build +FROM docker.io/golang:alpine as build +RUN apk add hugo make git --no-cache 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 d90bba8..cbd2d11 100644 --- a/Makefile +++ b/Makefile @@ -25,31 +25,25 @@ test-publish: build clean: @rm -rf ./public ./resources ./themes ./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 - 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_BIN) --verbose --gc --minify --templateMetrics --templateMetricsHints --enableGitInfo --environment production +public: ./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 ./themes/lines: + @mkdir -p ./themes/lines @git submodule update --init ./assets/css: @mkdir -p ./assets/css ./assets/css/syntax.light.css: $(HUGO_BIN) ./assets/css - @$(HUGO_BIN) gen chromastyles --style=github > assets/css/syntax.light.css + @hugo gen chromastyles --style=github > assets/css/syntax.light.css ./assets/css/syntax.dark.css: $(HUGO_BIN) ./assets/css - @$(HUGO_BIN) gen chromastyles --style=github-dark > assets/css/syntax.dark.css + @hugo gen chromastyles --style=github-dark > assets/css/syntax.dark.css ./layouts/partials/single/footer.html: $(OPENRING_BIN) @mkdir -p ./layouts/partials/single/