Skip to content

Commit

Permalink
Bump to 0.38.
Browse files Browse the repository at this point in the history
  • Loading branch information
klakegg committed Apr 3, 2018
1 parent 1fad2c3 commit 9247f45
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 13 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.37.1
ARG VERSION=0.38

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.37.1
ARG VERSION=0.38

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
23 changes: 12 additions & 11 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,23 +8,26 @@ 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.37.1: `0.37.1-busybox`, `busybox`, `0.37.1`, `latest` ([Dockerfile](https://github.com/klakegg/docker-hugo/blob/0.37.1/Dockerfile))
* Hugo 0.38: `0.38-busybox`, `busybox`, `0.38`, `latest` ([Dockerfile](https://github.com/klakegg/docker-hugo/blob/0.38/Dockerfile))
* Hugo 0.37.1: `0.37.1-busybox`, `0.37.1` ([Dockerfile](https://github.com/klakegg/docker-hugo/blob/0.37.1/Dockerfile))
* Hugo 0.37: `0.37-busybox`, `0.37` ([Dockerfile](https://github.com/klakegg/docker-hugo/blob/0.37/Dockerfile))
* Hugo 0.36.1: `0.36.1-busybox`, `0.36.1` ([Dockerfile](https://github.com/klakegg/docker-hugo/blob/0.36.1/Dockerfile))
* Hugo 0.36: `0.36-busybox`, `0.36` ([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.37.1: `0.37.1-alpine`, `alpine` ([Dockerfile](https://github.com/klakegg/docker-hugo/blob/0.37.1/Dockerfile-alpine))
* Hugo 0.38: `0.38-alpine`, `alpine` ([Dockerfile](https://github.com/klakegg/docker-hugo/blob/0.38/Dockerfile-alpine))
* Hugo 0.37.1: `0.37.1-alpine` ([Dockerfile](https://github.com/klakegg/docker-hugo/blob/0.37.1/Dockerfile-alpine))
* Hugo 0.37: `0.37-alpine` ([Dockerfile](https://github.com/klakegg/docker-hugo/blob/0.37/Dockerfile-alpine))
* Hugo 0.36.1: `0.36.1-alpine` ([Dockerfile](https://github.com/klakegg/docker-hugo/blob/0.36.1/Dockerfile-alpine))
* Hugo 0.36: `0.36-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.37.1: `0.37.1-asciidoctor`, `asciidoctor` ([Dockerfile](https://github.com/klakegg/docker-hugo/blob/0.37.1/Dockerfile-asciidoctor))
* Hugo 0.38: `0.38-asciidoctor`, `asciidoctor` ([Dockerfile](https://github.com/klakegg/docker-hugo/blob/0.38/Dockerfile-asciidoctor))
* Hugo 0.37.1: `0.37.1-asciidoctor` ([Dockerfile](https://github.com/klakegg/docker-hugo/blob/0.37.1/Dockerfile-asciidoctor))
* Hugo 0.37: `0.37-asciidoctor` ([Dockerfile](https://github.com/klakegg/docker-hugo/blob/0.37/Dockerfile-asciidoctor))
* Hugo 0.36.1: `0.36.1-asciidoctor` ([Dockerfile](https://github.com/klakegg/docker-hugo/blob/0.36.1/Dockerfile-asciidoctor))
* Hugo 0.36: `0.36-asciidoctor` ([Dockerfile](https://github.com/klakegg/docker-hugo/blob/0.36/Dockerfile-asciidoctor))
Expand All @@ -43,11 +46,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.37.1```
```docker run --rm -it -v $(pwd):/src -v $(pwd)/output:/target klakegg/hugo:0.38```

Run server:

```docker run --rm -it -v $(pwd):/src -p 1313:1313 klakegg/hugo:0.37.1 server```
```docker run --rm -it -v $(pwd):/src -p 1313:1313 klakegg/hugo:0.38 server```


### docker-compose
Expand All @@ -56,7 +59,7 @@ Normal build:

```
build:
image: klakegg/hugo:0.37.1
image: klakegg/hugo:0.38
volumes:
- .:/src
- ./output:/target
Expand All @@ -66,7 +69,7 @@ Run server:

```
server:
image: klakegg/hugo:0.37.1
image: klakegg/hugo:0.38
command: server
volumes:
- .:/src
Expand All @@ -81,13 +84,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.37.1```
```docker run --rm -it -v $(pwd):/src -v $(pwd)/output:/target --entrypoint hugo klakegg/hugo:0.38```

In docker-compose using `entrypoint`:

```
build:
image: klakegg/hugo:0.37.1
image: klakegg/hugo:0.38
entrypoint: hugo
volumes:
- .:/src
Expand All @@ -107,5 +110,3 @@ Folders:

Ports:
* Port 1313


0 comments on commit 9247f45

Please sign in to comment.