annabunches/annabunches.net
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Update/fix build pipeline for hugo.

Browse Source
This commit is contained in:
Anna Rose 2020-05-15 01:45:53 +00:00
parent 15fbf7d7a0
commit 4967fadbc1
3 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.gitignore vendored
View File

@ -1,4 +1 @@
_site public/
_drafts
.sass-cache
.jekyll-metadata

10
Dockerfile
View File

@ -1,8 +1,8 @@
FROM jekyll/jekyll as build FROM klakegg/hugo as build
WORKDIR /srv/jekyll WORKDIR /src
COPY . /srv/jekyll COPY . /src/
RUN jekyll build --trace && cp -a _site/ /tmp/site RUN hugo
FROM nginx FROM nginx
COPY --from=build /tmp/site /usr/share/nginx/html COPY --from=build /src/public /usr/share/nginx/html

5
Makefile
View File

@ -1,9 +1,8 @@
DOCKER_IMAGE := cr.annabunch.es/annabunches-static DOCKER_IMAGE := cr.annabunch.es/annabunches-static
all: build .PHONY: all build push
serve: all: build
docker run --rm -it -p 4000:4000 -v $(shell pwd):/srv/jekyll jekyll/jekyll jekyll serve --drafts --future --safe -d /tmp/site --trace
build: build:
docker build -t ${DOCKER_IMAGE} . docker build -t ${DOCKER_IMAGE} .