From 14068e52ba31582800980a26b0ee7478fa942ef9 Mon Sep 17 00:00:00 2001 From: Erlend Klakegg Bergheim Date: Tue, 6 Feb 2018 09:50:59 +0100 Subject: [PATCH] Update for 0.36. --- Dockerfile | 2 +- Dockerfile-alpine | 2 +- Dockerfile-asciidoctor | 2 +- README.md | 21 ++++++++++++--------- 4 files changed, 15 insertions(+), 12 deletions(-) diff --git a/Dockerfile b/Dockerfile index 61fcfcbb..23446621 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ FROM busybox:1.28 AS fetch -ARG VERSION=0.35 +ARG VERSION=0.36 RUN echo "Version: ${VERSION}" ADD https://github.com/gohugoio/hugo/releases/download/v${VERSION}/hugo_${VERSION}_Linux-64bit.tar.gz /hugo.tar.gz diff --git a/Dockerfile-alpine b/Dockerfile-alpine index 71fd2cf8..78d2a5e8 100644 --- a/Dockerfile-alpine +++ b/Dockerfile-alpine @@ -1,6 +1,6 @@ FROM busybox:1.28 AS fetch -ARG VERSION=0.35 +ARG VERSION=0.36 RUN echo "Version: ${VERSION}" ADD https://github.com/gohugoio/hugo/releases/download/v${VERSION}/hugo_${VERSION}_Linux-64bit.tar.gz /hugo.tar.gz diff --git a/Dockerfile-asciidoctor b/Dockerfile-asciidoctor index 77e5371e..89abe615 100644 --- a/Dockerfile-asciidoctor +++ b/Dockerfile-asciidoctor @@ -1,6 +1,6 @@ FROM busybox:1.28 AS fetch -ARG VERSION=0.35 +ARG VERSION=0.36 RUN echo "Version: ${VERSION}" ADD https://github.com/gohugoio/hugo/releases/download/v${VERSION}/hugo_${VERSION}_Linux-64bit.tar.gz /hugo.tar.gz diff --git a/README.md b/README.md index fe39bf3a..de7cc552 100644 --- a/README.md +++ b/README.md @@ -8,15 +8,18 @@ Minimal docker image for [Hugo](http://gohugo.io/). This image sets `destination ## Available tags Default minimal image based upon [Busybox](https://hub.docker.com/r/_/busybox/): -* Hugo 0.35: `0.35-busybox`, `busybox`, `0.35`, `latest` ([Dockerfile](https://github.com/klakegg/docker-hugo/blob/0.35/Dockerfile)) +* Hugo 0.36: `0.35-busybox`, `busybox`, `0.35`, `latest` ([Dockerfile](https://github.com/klakegg/docker-hugo/blob/0.36/Dockerfile)) +* Hugo 0.35: `0.35-busybox`, `0.35` ([Dockerfile](https://github.com/klakegg/docker-hugo/blob/0.35/Dockerfile)) * Hugo 0.34: `0.34-busybox`, `0.34` ([Dockerfile](https://github.com/klakegg/docker-hugo/blob/0.34/Dockerfile)) Minimal image based upon [Alpine](https://hub.docker.com/r/_/alpine/): -* Hugo 0.35: `0.35-alpine`, `alpine` ([Dockerfile](https://github.com/klakegg/docker-hugo/blob/0.35/Dockerfile-alpine)) +* Hugo 0.36: `0.36-alpine`, `alpine` ([Dockerfile](https://github.com/klakegg/docker-hugo/blob/0.36/Dockerfile-alpine)) +* Hugo 0.35: `0.35-alpine` ([Dockerfile](https://github.com/klakegg/docker-hugo/blob/0.35/Dockerfile-alpine)) * Hugo 0.34: `0.34-alpine` ([Dockerfile](https://github.com/klakegg/docker-hugo/blob/0.34/Dockerfile-alpine)) Minimal image based upon [Alpine](https://hub.docker.com/r/_/alpine/) with [Asciidoctor](http://asciidoctor.org/) installed: -* Hugo 0.35: `0.35-asciidoctor`, `asciidoctor` ([Dockerfile](https://github.com/klakegg/docker-hugo/blob/0.35/Dockerfile-asciidoctor)) +* Hugo 0.36: `0.35-asciidoctor`, `asciidoctor` ([Dockerfile](https://github.com/klakegg/docker-hugo/blob/0.36/Dockerfile-asciidoctor)) +* Hugo 0.35: `0.35-asciidoctor` ([Dockerfile](https://github.com/klakegg/docker-hugo/blob/0.35/Dockerfile-asciidoctor)) * Hugo 0.34: `0.34-asciidoctor` ([Dockerfile](https://github.com/klakegg/docker-hugo/blob/0.34/Dockerfile-asciidoctor)) @@ -31,11 +34,11 @@ The good practice of having a separate output folder is part of the image. Normal build: -```docker run --rm -it -v $(pwd):/src -v $(pwd)/output:/target klakegg/hugo:0.35``` +```docker run --rm -it -v $(pwd):/src -v $(pwd)/output:/target klakegg/hugo:0.36``` Run server: -```docker run --rm -it -v $(pwd):/src -p 1313:1313 klakegg/hugo:0.35 server``` +```docker run --rm -it -v $(pwd):/src -p 1313:1313 klakegg/hugo:0.36 server``` ### docker-compose @@ -44,7 +47,7 @@ Normal build: ``` build: - image: klakegg/hugo:0.35 + image: klakegg/hugo:0.36 volumes: - .:/src - ./output:/target @@ -54,7 +57,7 @@ Run server: ``` server: - image: klakegg/hugo:0.35 + image: klakegg/hugo:0.36 command: server volumes: - .:/src @@ -69,13 +72,13 @@ Those wanting to override entrypoint in the image may easily do so. On command line using `--entrypoint`: -```docker run --rm -it -v $(pwd):/src -v $(pwd)/output:/target --entrypoint hugo klakegg/hugo:0.35``` +```docker run --rm -it -v $(pwd):/src -v $(pwd)/output:/target --entrypoint hugo klakegg/hugo:0.36``` In docker-compose using `entrypoint`: ``` build: - image: klakegg/hugo:0.35 + image: klakegg/hugo:0.36 entrypoint: hugo volumes: - .:/src