Compare commits

...

1 Commits

Author SHA1 Message Date
Adam Veldhousen 2cf53d5c2b
change theme, trying to get ci to work now
ci.vdhsn.com/push Build encountered an error Details
2023-01-27 18:33:24 -06:00
5 changed files with 35 additions and 127 deletions

View File

@ -1,132 +1,40 @@
kind: pipeline kind: pipeline
type: docker type: kubernetes
name: master build and deploy name: Build and Publish
volumes:
- name: dockersock
host:
path: /var/run/docker.sock
environment:
GOPATH: /go/
HUGO_VERSION: 0.59.1
DOCKER_PASSWORD:
from_secret: DOCKER_TOKEN
trigger: trigger:
event: event:
- push - push
- cron
branch:
include:
- master
steps: steps:
- name: docker build and publish - prod - name: Build & Publish
image: docker:dind image: plugins/kaniko
environment: settings:
DOCKER_PASSWORD: username:
from_secret: DOCKER_TOKEN from_secret: DOCKER_USERNAME
volumes: password:
- name: dockersock from_secret: DOCKER_PASSWORD
path: /var/run/docker.sock repo: vdhsn/blog
commands: tags:
- apk add make git - ${DRONE_COMMIT_SHA}
- docker login -u adamveld12 -p ${DOCKER_PASSWORD} - ${DRONE_BRANCH}
- 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
--- ---
kind: pipeline kind: pipeline
type: docker type: kubernetes
name: PR build name: Deploy
volumes:
- name: dockersock
host:
path: /var/run/docker.sock
environment:
GOPATH: /go/
HUGO_VERSION: 0.59.1
trigger: trigger:
event: event:
- cron - promote
- pull_request
branch:
include:
- master
steps: steps:
- name: docker build and publish - prod - name: Publish Latest
image: docker:dind image: plugins/kaniko
environment: settings:
DOCKER_PASSWORD: username:
from_secret: DOCKER_TOKEN from_secret: DOCKER_USERNAME
volumes: password:
- name: dockersock from_secret: DOCKER_PASSWORD
path: /var/run/docker.sock repo: vdhsn/blog
commands: tags:
- apk add make git - latest
- 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

2
.gitignore vendored
View File

@ -1,5 +1,5 @@
resources
public public
resources
# generated by hugo gen # generated by hugo gen
assets/css/syntax.light.css assets/css/syntax.light.css

View File

@ -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 GOPATH=/go
ENV GOBIN=/go/bin ENV GOBIN=/go/bin
COPY . /go/src/blog COPY . /go/src/blog
WORKDIR /go/src/blog WORKDIR /go/src/blog
RUN go get -u git.sr.ht/~sircmpwn/openring
RUN make public RUN make public
FROM nginx FROM nginx

View File

@ -1,7 +1,6 @@
VERSION := $(shell git rev-parse --abbrev-ref HEAD) VERSION := $(shell git rev-parse --abbrev-ref HEAD)
GOBIN = $(shell go env GOPATH)/bin GOBIN = $(shell go env GOPATH)/bin
.PHONY: serve .PHONY: serve
serve: assets serve: assets
hugo server -D --log -w --bind 0.0.0.0 hugo server -D --log -w --bind 0.0.0.0
@ -62,13 +61,13 @@ $(OPENRING_BIN):
./layouts/partials/single/footer.html: $(OPENRING_BIN) ./layouts/partials/single/footer.html: $(OPENRING_BIN)
mkdir -p ./layouts/partials/single mkdir -p ./layouts/partials/single
$(OPENRING_BIN) \ $(OPENRING_BIN) \
-s https://drewdevault.com/feed.xml \
-s https://dave.cheney.net/feed/atom \ -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://tech.davis-hansson.com/index.xml \
-s https://blog.benjojo.co.uk/rss.xml \
-s https://drewdevault.com/feed.xml \
< ./assets/openring.in.html \ < ./assets/openring.in.html \
> ./layouts/partials/single/footer.html > ./layouts/partials/single/footer.html
public: ./assets/css/syntax.light.css ./assets/css/syntax.dark.css ./layouts/partials/openring.out.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

@ -1 +1 @@
Subproject commit 2d63ad0141c758b6331efe4aeb48d3ebbeae0b37 Subproject commit a85d561cac091fcd73a248c3d3c426d39ac15155