From 57590355e636680c94aedae725cd4e9d1b054f4d Mon Sep 17 00:00:00 2001 From: Erlend Klakegg Bergheim Date: Mon, 23 Apr 2018 10:48:39 +0200 Subject: [PATCH] Version 0.40. --- Dockerfile | 2 +- Dockerfile-alpine | 2 +- README.md | 21 ++++++++++++--------- 3 files changed, 14 insertions(+), 11 deletions(-) diff --git a/Dockerfile b/Dockerfile index 506da774..b73b747a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ FROM busybox:1.28 AS fetch -ARG VERSION=0.39 +ARG VERSION=0.40 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 8fa85ab2..0f35ee95 100644 --- a/Dockerfile-alpine +++ b/Dockerfile-alpine @@ -1,6 +1,6 @@ FROM busybox:1.28 AS fetch -ARG VERSION=0.39 +ARG VERSION=0.40 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 c7d4cfc1..550e9e29 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.39: `0.39-busybox`, `busybox`, `0.39`, `latest` ([Dockerfile](https://github.com/klakegg/docker-hugo/blob/0.39/Dockerfile)) +* Hugo 0.40: `0.40-busybox`, `busybox`, `0.40`, `latest` ([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)) * Hugo 0.38: `0.38-busybox`, `0.38` ([Dockerfile](https://github.com/klakegg/docker-hugo/blob/0.38/Dockerfile)) @@ -20,7 +21,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.39: `0.39-alpine`, `alpine` ([Dockerfile](https://github.com/klakegg/docker-hugo/blob/0.39/Dockerfile-alpine)) +* Hugo 0.40: `0.40-alpine`, `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)) * Hugo 0.38: `0.38-alpine` ([Dockerfile](https://github.com/klakegg/docker-hugo/blob/0.38/Dockerfile-alpine)) @@ -32,7 +34,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.39: `0.39-asciidoctor`, `asciidoctor` ([Dockerfile](https://github.com/klakegg/docker-hugo/blob/0.39/Dockerfile-asciidoctor)) +* Hugo 0.40: `0.40-asciidoctor`, `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)) * Hugo 0.38: `0.38-asciidoctor` ([Dockerfile](https://github.com/klakegg/docker-hugo/blob/0.38/Dockerfile-asciidoctor)) @@ -55,11 +58,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.39``` +```docker run --rm -it -v $(pwd):/src -v $(pwd)/output:/target klakegg/hugo:0.40``` Run server: -```docker run --rm -it -v $(pwd):/src -p 1313:1313 klakegg/hugo:0.39 server``` +```docker run --rm -it -v $(pwd):/src -p 1313:1313 klakegg/hugo:0.40 server``` ### docker-compose @@ -68,7 +71,7 @@ Normal build: ``` build: - image: klakegg/hugo:0.39 + image: klakegg/hugo:0.40 volumes: - .:/src - ./output:/target @@ -78,7 +81,7 @@ Run server: ``` server: - image: klakegg/hugo:0.39 + image: klakegg/hugo:0.40 command: server volumes: - .:/src @@ -93,13 +96,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.39``` +```docker run --rm -it -v $(pwd):/src -v $(pwd)/output:/target --entrypoint hugo klakegg/hugo:0.40``` In docker-compose using `entrypoint`: ``` build: - image: klakegg/hugo:0.39 + image: klakegg/hugo:0.40 entrypoint: hugo volumes: - .:/src