Update/fix build pipeline for hugo.
This commit is contained in:
parent
15fbf7d7a0
commit
4967fadbc1
5
.gitignore
vendored
5
.gitignore
vendored
|
@ -1,4 +1 @@
|
|||
_site
|
||||
_drafts
|
||||
.sass-cache
|
||||
.jekyll-metadata
|
||||
public/
|
||||
|
|
10
Dockerfile
10
Dockerfile
|
@ -1,8 +1,8 @@
|
|||
FROM jekyll/jekyll as build
|
||||
FROM klakegg/hugo as build
|
||||
|
||||
WORKDIR /srv/jekyll
|
||||
COPY . /srv/jekyll
|
||||
RUN jekyll build --trace && cp -a _site/ /tmp/site
|
||||
WORKDIR /src
|
||||
COPY . /src/
|
||||
RUN hugo
|
||||
|
||||
FROM nginx
|
||||
COPY --from=build /tmp/site /usr/share/nginx/html
|
||||
COPY --from=build /src/public /usr/share/nginx/html
|
||||
|
|
5
Makefile
5
Makefile
|
@ -1,9 +1,8 @@
|
|||
DOCKER_IMAGE := cr.annabunch.es/annabunches-static
|
||||
|
||||
all: build
|
||||
.PHONY: all build push
|
||||
|
||||
serve:
|
||||
docker run --rm -it -p 4000:4000 -v $(shell pwd):/srv/jekyll jekyll/jekyll jekyll serve --drafts --future --safe -d /tmp/site --trace
|
||||
all: build
|
||||
|
||||
build:
|
||||
docker build -t ${DOCKER_IMAGE} .
|
||||
|
|
Loading…
Reference in New Issue
Block a user