diff --git a/Dockerfile b/Dockerfile index 9d5d6a99..8871f1bc 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,60 +1,9 @@ -# Usage: -# docker build -t jarv.is -f Dockerfile . -# docker run -v $(pwd):/src -p 1337:1337 jarv.is -# ...then open http://localhost:1337 for the live-refresh server. -# -# Based on: https://hub.docker.com/r/jakejarvis/hugo-extended - -# Hugo doesn't require Go to run, *except* if you're using Hugo Modules. It's -# much easier to install Node on the Go base image than vice-versa. -FROM golang:1.14-alpine - -ENV HUGO_VERSION 0.74.3 -# remove/comment the following line completely to build with vanilla Hugo: -ENV HUGO_EXTENDED 1 - -LABEL maintainer="Jake Jarvis " -LABEL homepage="https://jarv.is/" -LABEL repository="https://github.com/jakejarvis/jarv.is" - -# only install libc6-compat & libstdc++ if we're building extended Hugo -# https://gitlab.com/yaegashi/hugo/commit/22f0d5cbd6114210ba7835468facbdee60609aa2 -RUN apk update && \ - apk add --no-cache \ - ca-certificates \ - git \ - nodejs \ - npm \ - yarn \ - python3 \ - py3-pip \ - ruby \ - ${HUGO_EXTENDED:+libc6-compat libstdc++} && \ - update-ca-certificates && \ - npm install --global postcss-cli autoprefixer @babel/core @babel/cli && \ - pip3 install --upgrade Pygments==2.* && \ - gem install asciidoctor && \ - wget https://github.com/gohugoio/hugo/releases/download/v${HUGO_VERSION}/hugo_${HUGO_EXTENDED:+extended_}${HUGO_VERSION}_Linux-64bit.tar.gz && \ - wget https://github.com/gohugoio/hugo/releases/download/v${HUGO_VERSION}/hugo_${HUGO_VERSION}_checksums.txt && \ - grep hugo_${HUGO_EXTENDED:+extended_}${HUGO_VERSION}_Linux-64bit.tar.gz hugo_${HUGO_VERSION}_checksums.txt | sha256sum -c && \ - tar xf hugo_${HUGO_EXTENDED:+extended_}${HUGO_VERSION}_Linux-64bit.tar.gz && \ - mv hugo /usr/local/bin/ && \ - chmod +x /usr/local/bin/hugo && \ - rm -rf hugo_* LICENSE README.md - -# verify everything's OK -RUN hugo env && \ - postcss --version && \ - autoprefixer --version && \ - pygmentize -V && \ - asciidoctor --version - -# add site source as volume -VOLUME /src -WORKDIR /src +# pulls from pre-built Hugo base image: +# https://github.com/jakejarvis/hugo-docker/blob/master/Dockerfile +# https://hub.docker.com/r/jakejarvis/hugo-extended +FROM jakejarvis/hugo-extended:0.74.3 # expose live-refresh server (on custom port) EXPOSE 1337 -ENTRYPOINT ["hugo"] -CMD ["server", "--buildDrafts", "--buildFuture", "--port", "1337", "--bind", "0.0.0.0", "--verbose"] +CMD ["server", "--disableFastRender", "--buildDrafts", "--buildFuture", "--port", "1337", "--bind", "0.0.0.0", "--verbose"]