From d6309f13db32e310374b0a41cc0c72f1bc7cd7cc Mon Sep 17 00:00:00 2001 From: Erlend Klakegg Bergheim Date: Wed, 25 Apr 2018 16:23:51 +0200 Subject: [PATCH] Version 0.40.1 --- Dockerfile | 2 +- Dockerfile-alpine | 2 +- README.md | 21 ++++++++++++--------- 3 files changed, 14 insertions(+), 11 deletions(-) diff --git a/Dockerfile b/Dockerfile index b73b747a..64110622 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ FROM busybox:1.28 AS fetch -ARG VERSION=0.40 +ARG VERSION=0.40.1 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 0f35ee95..ff62ef47 100644 --- a/Dockerfile-alpine +++ b/Dockerfile-alpine @@ -1,6 +1,6 @@ FROM busybox:1.28 AS fetch -ARG VERSION=0.40 +ARG VERSION=0.40.1 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 550e9e29..805e71e4 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,8 @@ 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.40: `0.40-busybox`, `busybox`, `0.40`, `latest` ([Dockerfile](https://github.com/klakegg/docker-hugo/blob/0.40/Dockerfile)) +* Hugo 0.40.1: `0.40.1-busybox`, `busybox`, `0.40.1`, `latest` ([Dockerfile](https://github.com/klakegg/docker-hugo/blob/0.40.1/Dockerfile)) +* Hugo 0.40: `0.40-busybox`, `0.40` ([Dockerfile](https://github.com/klakegg/docker-hugo/blob/0.40/Dockerfile)) * Hugo 0.39: `0.39-busybox`, `0.39` ([Dockerfile](https://github.com/klakegg/docker-hugo/blob/0.39/Dockerfile)) * Hugo 0.38.2: `0.38.2-busybox`, `0.38.2` ([Dockerfile](https://github.com/klakegg/docker-hugo/blob/0.38.2/Dockerfile)) * Hugo 0.38.1: `0.38.1-busybox`, `0.38.1` ([Dockerfile](https://github.com/klakegg/docker-hugo/blob/0.38.1/Dockerfile)) @@ -21,7 +22,8 @@ Default minimal image based upon [Busybox](https://hub.docker.com/r/_/busybox/): * 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.40: `0.40-alpine`, `alpine` ([Dockerfile](https://github.com/klakegg/docker-hugo/blob/0.40/Dockerfile-alpine)) +* Hugo 0.40.1: `0.40.1-alpine`, `alpine` ([Dockerfile](https://github.com/klakegg/docker-hugo/blob/0.40.1/Dockerfile-alpine)) +* Hugo 0.40: `0.40-alpine` ([Dockerfile](https://github.com/klakegg/docker-hugo/blob/0.40/Dockerfile-alpine)) * Hugo 0.39: `0.39-alpine` ([Dockerfile](https://github.com/klakegg/docker-hugo/blob/0.39/Dockerfile-alpine)) * Hugo 0.38.2: `0.38.2-alpine` ([Dockerfile](https://github.com/klakegg/docker-hugo/blob/0.38.2/Dockerfile-alpine)) * Hugo 0.38.1: `0.38.1-alpine` ([Dockerfile](https://github.com/klakegg/docker-hugo/blob/0.38.1/Dockerfile-alpine)) @@ -34,7 +36,8 @@ Minimal image based upon [Alpine](https://hub.docker.com/r/_/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.40: `0.40-asciidoctor`, `asciidoctor` ([Dockerfile](https://github.com/klakegg/docker-hugo/blob/0.40/Dockerfile-asciidoctor)) +* Hugo 0.40.1: `0.40.1-asciidoctor`, `asciidoctor` ([Dockerfile](https://github.com/klakegg/docker-hugo/blob/0.40.1/Dockerfile-asciidoctor)) +* Hugo 0.40: `0.40-asciidoctor` ([Dockerfile](https://github.com/klakegg/docker-hugo/blob/0.40/Dockerfile-asciidoctor)) * Hugo 0.39: `0.39-asciidoctor` ([Dockerfile](https://github.com/klakegg/docker-hugo/blob/0.39/Dockerfile-asciidoctor)) * Hugo 0.38.2: `0.38.2-asciidoctor` ([Dockerfile](https://github.com/klakegg/docker-hugo/blob/0.38.2/Dockerfile-asciidoctor)) * Hugo 0.38.1: `0.38.1-asciidoctor` ([Dockerfile](https://github.com/klakegg/docker-hugo/blob/0.38.1/Dockerfile-asciidoctor)) @@ -58,11 +61,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.40``` +```docker run --rm -it -v $(pwd):/src -v $(pwd)/output:/target klakegg/hugo:0.40.1``` Run server: -```docker run --rm -it -v $(pwd):/src -p 1313:1313 klakegg/hugo:0.40 server``` +```docker run --rm -it -v $(pwd):/src -p 1313:1313 klakegg/hugo:0.40.1 server``` ### docker-compose @@ -71,7 +74,7 @@ Normal build: ``` build: - image: klakegg/hugo:0.40 + image: klakegg/hugo:0.40.1 volumes: - .:/src - ./output:/target @@ -81,7 +84,7 @@ Run server: ``` server: - image: klakegg/hugo:0.40 + image: klakegg/hugo:0.40.1 command: server volumes: - .:/src @@ -96,13 +99,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.40``` +```docker run --rm -it -v $(pwd):/src -v $(pwd)/output:/target --entrypoint hugo klakegg/hugo:0.40.1``` In docker-compose using `entrypoint`: ``` build: - image: klakegg/hugo:0.40 + image: klakegg/hugo:0.40.1 entrypoint: hugo volumes: - .:/src