Skip to content

Commit

Permalink
Version 0.42
Browse files Browse the repository at this point in the history
  • Loading branch information
klakegg committed Jun 12, 2018
1 parent 6fadabc commit a34c469
Show file tree
Hide file tree
Showing 4 changed files with 22 additions and 16 deletions.
25 changes: 14 additions & 11 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,21 +9,24 @@ These images sets `destination` during build and `bind` when started as server,
## Available tags

Default minimal image based upon [Busybox](https://hub.docker.com/r/_/busybox/):
* Hugo 0.41: `0.41-busybox`, `busybox`, `0.41`, `latest`, `0.41-busybox-onbuild`, `0.41-onbuild`, `busybox-onbuild`, `onbuild` ([Dockerfile](https://github.com/klakegg/docker-hugo/blob/0.41/busybox/Dockerfile-busybox))
* Hugo 0.42: `0.42-busybox`, `busybox`, `0.42`, `latest`, `0.42-busybox-onbuild`, `0.42-onbuild`, `busybox-onbuild`, `onbuild` ([Dockerfile](https://github.com/klakegg/docker-hugo/blob/0.42/busybox/Dockerfile-busybox))
* Hugo 0.41: `0.41-busybox`, `0.41`, `0.41-busybox-onbuild`, `0.41-onbuild` ([Dockerfile](https://github.com/klakegg/docker-hugo/blob/0.41/busybox/Dockerfile-busybox))
* Hugo 0.40.3: `0.40.3-busybox`, `0.40.3` ([Dockerfile](https://github.com/klakegg/docker-hugo/blob/0.40.3/Dockerfile))
* Hugo 0.40.2: `0.40.2-busybox`, `0.40.2` ([Dockerfile](https://github.com/klakegg/docker-hugo/blob/0.40.2/Dockerfile))
* Hugo 0.40.1: `0.40.1-busybox`, `0.40.1` ([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))

Minimal image based upon [Alpine](https://hub.docker.com/r/_/alpine/):
* Hugo 0.41: `0.41-alpine`, `alpine`, `0.41-alpine-onbuild`, `alpine-onbuild` ([Dockerfile](https://github.com/klakegg/docker-hugo/blob/0.41/alpine/Dockerfile-alpine))
* Hugo 0.42: `0.42-alpine`, `alpine`, `0.42-alpine-onbuild`, `alpine-onbuild` ([Dockerfile](https://github.com/klakegg/docker-hugo/blob/0.42/alpine/Dockerfile-alpine))
* Hugo 0.41: `0.41-alpine`, `0.41-alpine-onbuild` ([Dockerfile](https://github.com/klakegg/docker-hugo/blob/0.41/alpine/Dockerfile-alpine))
* Hugo 0.40.3: `0.40.3-alpine` ([Dockerfile](https://github.com/klakegg/docker-hugo/blob/0.40.3/Dockerfile-alpine))
* Hugo 0.40.2: `0.40.2-alpine` ([Dockerfile](https://github.com/klakegg/docker-hugo/blob/0.40.2/Dockerfile-alpine))
* Hugo 0.40.1: `0.40.1-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))

Minimal image based upon [Alpine](https://hub.docker.com/r/_/alpine/) with [Asciidoctor](http://asciidoctor.org/) installed:
* Hugo 0.41: `0.41-asciidoctor`, `asciidoctor`, `0.41-asciidoctor-onbuild`, `asciidoctor-onbuild` ([Dockerfile](https://github.com/klakegg/docker-hugo/blob/0.41/alpine/Dockerfile-asciidoctor))
* Hugo 0.42: `0.42-asciidoctor`, `asciidoctor`, `0.42-asciidoctor-onbuild`, `asciidoctor-onbuild` ([Dockerfile](https://github.com/klakegg/docker-hugo/blob/0.42/alpine/Dockerfile-asciidoctor))
* Hugo 0.41: `0.41-asciidoctor`, `0.41-asciidoctor-onbuild` ([Dockerfile](https://github.com/klakegg/docker-hugo/blob/0.41/alpine/Dockerfile-asciidoctor))
* Hugo 0.40.3: `0.40.3-asciidoctor` ([Dockerfile](https://github.com/klakegg/docker-hugo/blob/0.40.3/Dockerfile-asciidoctor))
* Hugo 0.40.2: `0.40.2-asciidoctor` ([Dockerfile](https://github.com/klakegg/docker-hugo/blob/0.40.2/Dockerfile-asciidoctor))
* Hugo 0.40.1: `0.40.1-asciidoctor` ([Dockerfile](https://github.com/klakegg/docker-hugo/blob/0.40.1/Dockerfile-asciidoctor))
Expand All @@ -45,13 +48,13 @@ 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.41
docker run --rm -it -v $(pwd):/src -v $(pwd)/output:/target klakegg/hugo:0.42
```

Run server:

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


Expand All @@ -61,7 +64,7 @@ Normal build:

```yaml
build:
image: klakegg/hugo:0.41
image: klakegg/hugo:0.42
volumes:
- .:/src
- ./output:/target
Expand All @@ -71,7 +74,7 @@ Run server:
```yaml
server:
image: klakegg/hugo:0.41
image: klakegg/hugo:0.42
command: server
volumes:
- .:/src
Expand All @@ -88,7 +91,7 @@ Initiating the shell will trigger installation of bash and configuration of auto
To get into a shell for your site:
```
docker run --rm -it -v $(pwd):/src klakegg/hugo:0.41-alpine shell
docker run --rm -it -v $(pwd):/src klakegg/hugo:0.42-alpine shell
```


Expand All @@ -99,7 +102,7 @@ The onbuild images adds content of the folder of your Dockerfile into `/src` and
Example Dockerfile for your project where the site is made into an nginx image (Docker 17.05-ce or newer):

```Dockerfile
FROM klakegg/hugo:0.41-onbuild AS hugo
FROM klakegg/hugo:0.42-onbuild AS hugo

FROM nginx
COPY --from=hugo /onbuild /usr/share/nginx/html
Expand All @@ -113,14 +116,14 @@ 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:/src/public --entrypoint hugo klakegg/hugo:0.41
docker run --rm -it -v $(pwd):/src -v $(pwd)/output:/src/public --entrypoint hugo klakegg/hugo:0.42
```

In docker-compose using `entrypoint`:

```yaml
build:
image: klakegg/hugo:0.41
image: klakegg/hugo:0.42
entrypoint: hugo
volumes:
- .:/src
Expand Down
2 changes: 1 addition & 1 deletion alpine/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.41
ARG VERSION=0.42

ADD https://github.com/gohugoio/hugo/releases/download/v${VERSION}/hugo_${VERSION}_Linux-64bit.tar.gz /hugo.tar.gz
RUN tar -zxvf hugo.tar.gz
Expand Down
2 changes: 1 addition & 1 deletion busybox/Dockerfile-busybox
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM busybox:1.28 AS fetch

ARG VERSION=0.41
ARG VERSION=0.42

ADD https://github.com/gohugoio/hugo/releases/download/v${VERSION}/hugo_${VERSION}_Linux-64bit.tar.gz /hugo.tar.gz
RUN tar -zxvf hugo.tar.gz
Expand Down
9 changes: 6 additions & 3 deletions tags.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
# All tags

Default minimal image based upon [Busybox](https://hub.docker.com/r/_/busybox/):
* Hugo 0.41: `0.41-busybox`, `busybox`, `0.41`, `latest`, `0.41-busybox-onbuild`, `0.41-onbuild`, `busybox-onbuild`, `onbuild` ([Dockerfile](https://github.com/klakegg/docker-hugo/blob/0.41/busybox/Dockerfile-busybox))
* Hugo 0.42: `0.42-busybox`, `busybox`, `0.42`, `latest`, `0.42-busybox-onbuild`, `0.42-onbuild`, `busybox-onbuild`, `onbuild` ([Dockerfile](https://github.com/klakegg/docker-hugo/blob/0.42/busybox/Dockerfile-busybox))
* Hugo 0.41: `0.41-busybox`, `0.41`, `0.41-busybox-onbuild`, `0.41-onbuild` ([Dockerfile](https://github.com/klakegg/docker-hugo/blob/0.41/busybox/Dockerfile-busybox))
* Hugo 0.40.3: `0.40.3-busybox`, `0.40.3` ([Dockerfile](https://github.com/klakegg/docker-hugo/blob/0.40.3/Dockerfile))
* Hugo 0.40.2: `0.40.2-busybox`, `0.40.2` ([Dockerfile](https://github.com/klakegg/docker-hugo/blob/0.40.2/Dockerfile))
* Hugo 0.40.1: `0.40.1-busybox`, `0.40.1` ([Dockerfile](https://github.com/klakegg/docker-hugo/blob/0.40.1/Dockerfile))
Expand All @@ -18,7 +19,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.41: `0.41-alpine`, `alpine`, `0.41-alpine-onbuild`, `alpine-onbuild` ([Dockerfile](https://github.com/klakegg/docker-hugo/blob/0.41/alpine/Dockerfile-alpine))
* Hugo 0.42: `0.42-alpine`, `alpine`, `0.42-alpine-onbuild`, `alpine-onbuild` ([Dockerfile](https://github.com/klakegg/docker-hugo/blob/0.42/alpine/Dockerfile-alpine))
* Hugo 0.41: `0.41-alpine`, `0.41-alpine-onbuild` ([Dockerfile](https://github.com/klakegg/docker-hugo/blob/0.41/alpine/Dockerfile-alpine))
* Hugo 0.40.3: `0.40.3-alpine` ([Dockerfile](https://github.com/klakegg/docker-hugo/blob/0.40.3/Dockerfile-alpine))
* Hugo 0.40.2: `0.40.2-alpine` ([Dockerfile](https://github.com/klakegg/docker-hugo/blob/0.40.2/Dockerfile-alpine))
* Hugo 0.40.1: `0.40.1-alpine` ([Dockerfile](https://github.com/klakegg/docker-hugo/blob/0.40.1/Dockerfile-alpine))
Expand All @@ -35,7 +37,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.41: `0.41-asciidoctor`, `asciidoctor`, `0.41-asciidoctor-onbuild`, `asciidoctor-onbuild` ([Dockerfile](https://github.com/klakegg/docker-hugo/blob/0.41/alpine/Dockerfile-asciidoctor))
* Hugo 0.42: `0.42-asciidoctor`, `asciidoctor`, `0.42-asciidoctor-onbuild`, `asciidoctor-onbuild` ([Dockerfile](https://github.com/klakegg/docker-hugo/blob/0.42/alpine/Dockerfile-asciidoctor))
* Hugo 0.41: `0.41-asciidoctor`, `0.41-asciidoctor-onbuild` ([Dockerfile](https://github.com/klakegg/docker-hugo/blob/0.41/alpine/Dockerfile-asciidoctor))
* Hugo 0.40.3: `0.40.3-asciidoctor` ([Dockerfile](https://github.com/klakegg/docker-hugo/blob/0.40.3/Dockerfile-asciidoctor))
* Hugo 0.40.2: `0.40.2-asciidoctor` ([Dockerfile](https://github.com/klakegg/docker-hugo/blob/0.40.2/Dockerfile-asciidoctor))
* Hugo 0.40.1: `0.40.1-asciidoctor` ([Dockerfile](https://github.com/klakegg/docker-hugo/blob/0.40.1/Dockerfile-asciidoctor))
Expand Down

0 comments on commit a34c469

Please sign in to comment.