got it to build

3 years ago · e64f84d582
parent db8c799707
commit e64f84d582
5 changed files with 10 additions and 14 deletions
--- a/3
+++ b/3
@ -1,9 +1,10 @@
-FROM golang as build
+FROM klakegg/hugo:0.81.0-ext-ubuntu-ci as build

 ENV GOPATH=/go
 ENV GOBIN=/go/bin
 COPY . /go/src/blog
 WORKDIR /go/src/blog
+RUN go get -u git.sr.ht/~sircmpwn/openring
 RUN make public

 FROM nginx
--- a/config.toml
+++ b/config.toml
@ -10,6 +10,7 @@ enableEmoji = true
 [params]
    author = "Adam Veldhousen"
    description = "I write software for a living and sometimes for fun. Copyright 2019 Adam Veldhousen"
+    scheme = "https"

 [menu]
  [[menu.main]]
--- a/layouts/_default/baseof.html
+++ b/layouts/_default/baseof.html
@ -11,11 +11,6 @@

 		<title>{{ .Title }}</title>

-		{{ $style := resources.Get (printf "css/colors-%s.scss" (.Site.Params.scheme | default "dark")) | toCSS | minify | fingerprint }}
-
-		<link rel="preload" href="{{ $style.Permalink }}" as="style">
-		<link rel="stylesheet" href="{{ $style.Permalink }}">
-
 		{{ partial "head.html" . }}
 	</head>
 	<body>
--- a/layouts/_default/list.html
+++ b/layouts/_default/list.html
@ -17,5 +17,4 @@
            </article>
        {{ end }}
    </section>
-	{{ partial "pagination.html" . }}
 {{ end }}
--- a/14
+++ b/14
@ -32,13 +32,13 @@ clean:
 .PHONY: serve new-post build publish test-publish docker-build-dev assets clean deploy

 $(HUGO_BIN):
-	@go get -u --tags extended -v github.com/gohugoio/hugo
+	@CGO_ENABLED=1 go get -u -v --tags extended github.com/gohugoio/hugo

 $(OPENRING_BIN):
-	@go get -u git.sr.ht/~sircmpwn/openring
+	@go get -u -v git.sr.ht/~sircmpwn/openring

-./assets/css/syntax.css: $(HUGO_BIN)
-	$(HUGO_BIN) gen chromastyles --style=solarized-dark256 > assets/css/syntax.css
+./assets/css/syntax.css: 
+	hugo gen chromastyles --style=solarized-dark256 > assets/css/syntax.css

 ./layouts/partials/openring.out.html: $(OPENRING_BIN)
 	$(OPENRING_BIN) \
@ -46,9 +46,9 @@ $(OPENRING_BIN):
 	  -s https://dave.cheney.net/feed/atom \
 	  -s https://blog.benjojo.co.uk/rss.xml \
 	  -s https://tech.davis-hansson.com/index.xml \
-	  < ./assets//openring.in.html \
+	  < ./assets/openring.in.html \
 	  > ./layouts/partials/openring.out.html

-public: ./assets/css/syntax.css ./layouts/partials/openring.out.html $(HUGO_BIN)
-	$(HUGO_BIN) --minify --gc
+public: ./assets/css/syntax.css ./layouts/partials/openring.out.html 
+	hugo --minify --gc