Skip to content

Commit

Permalink
Update for 0.36.
Browse files Browse the repository at this point in the history
  • Loading branch information
klakegg committed Feb 6, 2018
1 parent cf90daa commit 14068e5
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 12 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.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
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.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
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile-asciidoctor
Original file line number Diff line number Diff line change
@@ -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
Expand Down
21 changes: 12 additions & 9 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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))


Expand All @@ -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
Expand All @@ -44,7 +47,7 @@ Normal build:

```
build:
image: klakegg/hugo:0.35
image: klakegg/hugo:0.36
volumes:
- .:/src
- ./output:/target
Expand All @@ -54,7 +57,7 @@ Run server:

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

0 comments on commit 14068e5

Please sign in to comment.