From 2cf53d5c2b3f88234b07618f7efcdce3ed504447 Mon Sep 17 00:00:00 2001
From: Adam Veldhousen <adamveld12@gmail.com>
Date: Fri, 27 Jan 2023 18:30:02 -0600
Subject: [PATCH] change theme, trying to get ci to work now

---
 .drone.yml   | 146 ++++++++++-----------------------------------------
 .gitignore   |   2 +-
 Dockerfile   |   5 +-
 Makefile     |   7 ++-
 themes/lines |   2 +-
 5 files changed, 35 insertions(+), 127 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index 1448487..9706e96 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -1,132 +1,40 @@
 kind: pipeline
-type: docker
-name: master build and deploy 
-
-volumes:
-  - name: dockersock
-    host:
-      path: /var/run/docker.sock
-
-environment:
-  GOPATH: /go/
-  HUGO_VERSION: 0.59.1
-  DOCKER_PASSWORD:
-    from_secret: DOCKER_TOKEN
+type: kubernetes
+name: Build and Publish 
 
 trigger:
   event:
     - push
-    - cron
-  branch:
-    include:
-      - master
-steps:
-  - name: docker build and publish - prod
-    image: docker:dind
-    environment:
-      DOCKER_PASSWORD:
-        from_secret: DOCKER_TOKEN
-    volumes:
-      - name: dockersock
-        path: /var/run/docker.sock
-    commands:
-      - apk add make git
-      - docker login -u adamveld12 -p ${DOCKER_PASSWORD}
-      - make build publish-master
-
-  - name: deploy master
-    image: adamveld12/nomad:v1.0.4
-    environment:
-      NOMAD_ADDR: http://192.168.1.15:4646
-    commands:
-      - nomad job run ./nomad.job
-    trigger:
-      event:
-        - push
-      branch:
-        include:
-          - master
-
-  - name: docker build and publish PR
-    image: docker:dind
-    environment:
-      DOCKER_PASSWORD:
-        from_secret: DOCKER_TOKEN
-    volumes:
-      - name: dockersock
-        path: /var/run/docker.sock
-    commands:
-      - apk add make git
-      - docker login -u adamveld12 -p $${DOCKER_PASSWORD}
-      - make build publish
-    trigger:
-      event:
-        - pull_request
-        - cron
 
+steps:
+  - name: Build & Publish
+    image: plugins/kaniko
+    settings:
+      username:
+        from_secret: DOCKER_USERNAME
+      password:
+        from_secret: DOCKER_PASSWORD
+      repo: vdhsn/blog
+      tags:
+        - ${DRONE_COMMIT_SHA}
+        - ${DRONE_BRANCH}
 ---
-
 kind: pipeline
-type: docker
-name: PR build 
-
-volumes:
-  - name: dockersock
-    host:
-      path: /var/run/docker.sock
-
-environment:
-  GOPATH: /go/
-  HUGO_VERSION: 0.59.1
+type: kubernetes
+name: Deploy
 
 trigger:
   event:
-    - cron
-    - pull_request
+  - promote
 
-  branch:
-    include:
-      - master
 steps:
-  - name: docker build and publish - prod
-    image: docker:dind
-    environment:
-      DOCKER_PASSWORD:
-        from_secret: DOCKER_TOKEN
-    volumes:
-      - name: dockersock
-        path: /var/run/docker.sock
-    commands:
-      - apk add make git
-      - docker login -u adamveld12 -p ${DOCKER_PASSWORD}
-      - make build publish-master
-
-  - name: deploy master
-    image: adamveld12/nomad:v1.0.4
-    environment:
-      NOMAD_ADDR: http://192.168.1.15:4646
-    commands:
-      - nomad job run ./nomad.job
-    trigger:
-      event:
-        - push
-      branch:
-        include:
-          - master
-
-  - name: docker build and publish PR
-    image: docker:dind
-    environment:
-      DOCKER_PASSWORD:
-        from_secret: DOCKER_TOKEN
-    volumes:
-      - name: dockersock
-        path: /var/run/docker.sock
-    commands:
-      - apk add make git
-      - docker login -u adamveld12 -p $${DOCKER_PASSWORD}
-      - make build publish
-    trigger:
-      event:
-        - pull_request
-        - cron
+  - name: Publish Latest
+    image: plugins/kaniko
+    settings:
+      username:
+        from_secret: DOCKER_USERNAME
+      password:
+        from_secret: DOCKER_PASSWORD
+      repo: vdhsn/blog
+      tags:
+        - latest
diff --git a/.gitignore b/.gitignore
index 5b31419..c86ed24 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,5 @@
-resources
 public
+resources
 
 # generated by hugo gen
 assets/css/syntax.light.css
diff --git a/Dockerfile b/Dockerfile
index 94cf2fa..93f5b77 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,10 +1,11 @@
-FROM klakegg/hugo:0.81.0-ext-ubuntu-ci as build
+FROM golang:1.19 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
diff --git a/Makefile b/Makefile
index eceaa96..8a1bce4 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,6 @@
 VERSION := $(shell git rev-parse --abbrev-ref HEAD)
 GOBIN = $(shell go env GOPATH)/bin
 
-
 .PHONY: serve
 serve: assets
 	hugo server -D --log -w --bind 0.0.0.0
@@ -62,13 +61,13 @@ $(OPENRING_BIN):
 ./layouts/partials/single/footer.html: $(OPENRING_BIN)
 	mkdir -p ./layouts/partials/single
 	$(OPENRING_BIN) \
-	  -s https://drewdevault.com/feed.xml \
 	  -s https://dave.cheney.net/feed/atom \
-	  -s https://blog.benjojo.co.uk/rss.xml \
 	  -s https://tech.davis-hansson.com/index.xml \
+	  -s https://blog.benjojo.co.uk/rss.xml \
+	  -s https://drewdevault.com/feed.xml \
 	  < ./assets/openring.in.html \
 	  > ./layouts/partials/single/footer.html
 
 public: ./assets/css/syntax.light.css ./assets/css/syntax.dark.css ./layouts/partials/openring.out.html 
-	hugo --minify --gc
+	hugo --minify --gc --templateMetrics --templateHints --verbose --enableGitInfo
 
diff --git a/themes/lines b/themes/lines
index 2d63ad0..a85d561 160000
--- a/themes/lines
+++ b/themes/lines
@@ -1 +1 @@
-Subproject commit 2d63ad0141c758b6331efe4aeb48d3ebbeae0b37
+Subproject commit a85d561cac091fcd73a248c3d3c426d39ac15155