Skip to content

Commit

Permalink
Version 0.40.
Browse files Browse the repository at this point in the history
  • Loading branch information
klakegg committed Apr 23, 2018
1 parent 4c0e849 commit 5759035
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 11 deletions.
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile-alpine
Original file line number Diff line number Diff line change
@@ -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
Expand Down
21 changes: 12 additions & 9 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand All @@ -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))
Expand All @@ -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))
Expand All @@ -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
Expand All @@ -68,7 +71,7 @@ Normal build:

```
build:
image: klakegg/hugo:0.39
image: klakegg/hugo:0.40
volumes:
- .:/src
- ./output:/target
Expand All @@ -78,7 +81,7 @@ Run server:

```
server:
image: klakegg/hugo:0.39
image: klakegg/hugo:0.40
command: server
volumes:
- .:/src
Expand All @@ -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
Expand Down

0 comments on commit 5759035

Please sign in to comment.