Skip to content

Commit

Permalink
Version 0.50.
Browse files Browse the repository at this point in the history
  • Loading branch information
@klakegg
klakegg committed Nov 15, 2018
1 parent 9287d0c commit 60c2af2
Show file tree
Hide file tree
Showing 3 changed files with 36 additions and 32 deletions.
4 changes: 2 additions & 2 deletions Dockerfile-base
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM busybox:1.28 AS fetch-standard

ARG VERSION=0.49.2
ARG VERSION=0.50

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 All @@ -10,7 +10,7 @@ RUN ["/hugo", "version"]

FROM busybox:1.28 AS fetch-extended

ARG VERSION=0.49.2
ARG VERSION=0.50

ADD https://github.com/gohugoio/hugo/releases/download/v${VERSION}/hugo_extended_${VERSION}_Linux-64bit.tar.gz /hugo.tar.gz
RUN tar -zxvf hugo.tar.gz
Expand Down
44 changes: 21 additions & 23 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,47 +11,45 @@ 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.49.2: `0.49.2-busybox`, `busybox`, `0.49.2`, `latest`, `0.49.2-busybox-onbuild`, `0.49.2-onbuild`, `busybox-onbuild`, `onbuild` ([Dockerfile](https://github.com/klakegg/docker-hugo/blob/0.49.2/dist/busybox/Dockerfile-busybox))
* Hugo 0.50: `0.50-busybox`, `busybox`, `0.50`, `latest`, `0.50-busybox-onbuild`, `0.50-onbuild`, `busybox-onbuild`, `onbuild` ([Dockerfile](https://github.com/klakegg/docker-hugo/blob/0.50/dist/busybox/Dockerfile-busybox))
* Hugo 0.49.2: `0.49.2-busybox`, `0.49.2`, `0.49.2-busybox-onbuild`, `0.49.2-onbuild` ([Dockerfile](https://github.com/klakegg/docker-hugo/blob/0.49.2/dist/busybox/Dockerfile-busybox))
* Hugo 0.49.1: `0.49.1-busybox`, `0.49.1`, `0.49.1-busybox-onbuild`, `0.49.1-onbuild` ([Dockerfile](https://github.com/klakegg/docker-hugo/blob/0.49.1/dist/busybox/Dockerfile-busybox))
* Hugo 0.49: `0.49-busybox`, `0.49`, `0.49-busybox-onbuild`, `0.49-onbuild` ([Dockerfile](https://github.com/klakegg/docker-hugo/blob/0.49/dist/busybox/Dockerfile-busybox))
* Hugo 0.48: `0.48-busybox`, `0.48`, `0.48-busybox-onbuild`, `0.48-onbuild` ([Dockerfile](https://github.com/klakegg/docker-hugo/blob/0.48/dist/busybox/Dockerfile-busybox))
* Hugo 0.47.1: `0.47.1-busybox`, `0.47.1`, `0.47.1-busybox-onbuild`, `0.47.1-onbuild` ([Dockerfile](https://github.com/klakegg/docker-hugo/blob/0.47.1/dist/busybox/Dockerfile-busybox))
* Hugo 0.47: `0.47-busybox`, `0.47`, `0.47-busybox-onbuild`, `0.47-onbuild` ([Dockerfile](https://github.com/klakegg/docker-hugo/blob/0.47/dist/busybox/Dockerfile-busybox))

Minimal image based upon [Alpine](https://hub.docker.com/r/_/alpine/):
* Hugo 0.49.2: `0.49.2-alpine`, `alpine`, `0.49.2-alpine-onbuild`, `alpine-onbuild`, `0.49.2-ext-alpine`, `ext-alpine`, `0.49.2-ext-alpine-onbuild`, `ext-alpine-onbuild` ([Dockerfile](https://github.com/klakegg/docker-hugo/blob/0.49.2/dist/alpine/Dockerfile-alpine))
* Hugo 0.50: `0.50-alpine`, `alpine`, `0.50-alpine-onbuild`, `alpine-onbuild`, `0.50-ext-alpine`, `ext-alpine`, `0.50-ext-alpine-onbuild`, `ext-alpine-onbuild` ([Dockerfile](https://github.com/klakegg/docker-hugo/blob/0.50/dist/alpine/Dockerfile-alpine))
* Hugo 0.49.2: `0.49.2-alpine`, `0.49.2-alpine-onbuild`, `0.49.2-ext-alpine`, `0.49.2-ext-alpine-onbuild` ([Dockerfile](https://github.com/klakegg/docker-hugo/blob/0.49.2/dist/alpine/Dockerfile-alpine))
* Hugo 0.49.1: `0.49.1-alpine`, `0.49.1-alpine-onbuild`, `0.49.1-ext-alpine`, `0.49.1-ext-alpine-onbuild` ([Dockerfile](https://github.com/klakegg/docker-hugo/blob/0.49.1/dist/alpine/Dockerfile-alpine))
* Hugo 0.49: `0.49-alpine`, `0.49-alpine-onbuild`, `0.49-ext-alpine`, `0.49-ext-alpine-onbuild` ([Dockerfile](https://github.com/klakegg/docker-hugo/blob/0.49/dist/alpine/Dockerfile-alpine))
* Hugo 0.48: `0.48-alpine`, `0.48-alpine-onbuild`, `0.48-ext-alpine`, `0.48-ext-alpine-onbuild` ([Dockerfile](https://github.com/klakegg/docker-hugo/blob/0.48/dist/alpine/Dockerfile-alpine))
* Hugo 0.47.1: `0.47.1-alpine`, `0.47.1-alpine-onbuild`, `0.47.1-ext-alpine`, `0.47.1-ext-alpine-onbuild` ([Dockerfile](https://github.com/klakegg/docker-hugo/blob/0.47.1/dist/alpine/Dockerfile-alpine))
* Hugo 0.47: `0.47-alpine`, `0.47-alpine-onbuild`, `0.47-ext-alpine`, `0.47-ext-alpine-onbuild` ([Dockerfile](https://github.com/klakegg/docker-hugo/blob/0.47/dist/alpine/Dockerfile-alpine))

Minimal image based upon [Alpine](https://hub.docker.com/r/_/alpine/) with [Asciidoctor](http://asciidoctor.org/) installed:
* Hugo 0.49.2: `0.49.2-asciidoctor`, `asciidoctor`, `0.49.2-asciidoctor-onbuild`, `asciidoctor-onbuild`, `0.49.2-ext-asciidoctor`, `ext-asciidoctor`, `0.49.2-ext-asciidoctor-onbuild`, `ext-asciidoctor-onbuild` ([Dockerfile](https://github.com/klakegg/docker-hugo/blob/0.49.2/dist/alpine/Dockerfile-asciidoctor))
* Hugo 0.50: `0.50-asciidoctor`, `asciidoctor`, `0.50-asciidoctor-onbuild`, `asciidoctor-onbuild`, `0.50-ext-asciidoctor`, `ext-asciidoctor`, `0.50-ext-asciidoctor-onbuild`, `ext-asciidoctor-onbuild` ([Dockerfile](https://github.com/klakegg/docker-hugo/blob/0.50/dist/alpine/Dockerfile-asciidoctor))
* Hugo 0.49.2: `0.49.2-asciidoctor`, `0.49.2-asciidoctor-onbuild`, `0.49.2-ext-asciidoctor`, `0.49.2-ext-asciidoctor-onbuild` ([Dockerfile](https://github.com/klakegg/docker-hugo/blob/0.49.2/dist/alpine/Dockerfile-asciidoctor))
* Hugo 0.49.1: `0.49.1-asciidoctor`, `0.49.1-asciidoctor-onbuild`, `0.49.1-ext-asciidoctor`, `0.49.1-ext-asciidoctor-onbuild` ([Dockerfile](https://github.com/klakegg/docker-hugo/blob/0.49.1/dist/alpine/Dockerfile-asciidoctor))
* Hugo 0.49: `0.49-asciidoctor`, `0.49-asciidoctor-onbuild`, `0.49-ext-asciidoctor`, `0.49-ext-asciidoctor-onbuild`
* Hugo 0.48: `0.48-asciidoctor`, `0.48-asciidoctor-onbuild`, `0.48-ext-asciidoctor`, `0.48-ext-asciidoctor-onbuild` ([Dockerfile](https://github.com/klakegg/docker-hugo/blob/0.48/dist/alpine/Dockerfile-asciidoctor))
* Hugo 0.47.1: `0.47.1-asciidoctor`, `0.47.1-asciidoctor-onbuild`, `0.47.1-ext-asciidoctor`, `0.47.1-ext-asciidoctor-onbuild` ([Dockerfile](https://github.com/klakegg/docker-hugo/blob/0.47.1/dist/alpine/Dockerfile-asciidoctor))
* Hugo 0.47: `0.47-asciidoctor`, `0.47-asciidoctor-onbuild`, `0.47-ext-asciidoctor`, `0.47-ext-asciidoctor-onbuild` ([Dockerfile](https://github.com/klakegg/docker-hugo/blob/0.47/dist/alpine/Dockerfile-asciidoctor))

Minimal image based upon [Alpine](https://hub.docker.com/r/_/alpine/) with [Pandoc](https://pandoc.org/) installed:
* Hugo 0.49.2: `0.49.2-pandoc`, `pandoc`, `0.49.2-pandoc-onbuild`, `pandoc-onbuild`, `0.49.2-ext-pandoc`, `ext-pandoc`, `0.49.2-ext-pandoc-onbuild`, `ext-asciidoctor-onbuild` ([Dockerfile](https://github.com/klakegg/docker-hugo/blob/0.49.2/dist/alpine/Dockerfile-pandoc))
* Hugo 0.50: `0.50-pandoc`, `pandoc`, `0.50-pandoc-onbuild`, `pandoc-onbuild`, `0.50-ext-pandoc`, `ext-pandoc`, `0.50-ext-pandoc-onbuild`, `ext-asciidoctor-onbuild` ([Dockerfile](https://github.com/klakegg/docker-hugo/blob/0.50/dist/alpine/Dockerfile-pandoc))
* Hugo 0.49.2: `0.49.2-pandoc`, `0.49.2-pandoc-onbuild`, `0.49.2-ext-pandoc`, `0.49.2-ext-pandoc-onbuild` ([Dockerfile](https://github.com/klakegg/docker-hugo/blob/0.49.2/dist/alpine/Dockerfile-pandoc))
* Hugo 0.49.1: `0.49.1-pandoc`, `0.49.1-pandoc-onbuild`, `0.49.1-ext-pandoc`, `0.49.1-ext-pandoc-onbuild` ([Dockerfile](https://github.com/klakegg/docker-hugo/blob/0.49.1/dist/alpine/Dockerfile-pandoc))
* Hugo 0.49: `0.49-pandoc`, `0.49-pandoc-onbuild`, `0.49-ext-pandoc`, `0.49-ext-pandoc-onbuild` ([Dockerfile](https://github.com/klakegg/docker-hugo/blob/0.49/dist/alpine/Dockerfile-pandoc))
* Hugo 0.48: `0.48-pandoc`, `0.48-pandoc-onbuild`, `0.48-ext-pandoc`, `0.48-ext-pandoc-onbuild` ([Dockerfile](https://github.com/klakegg/docker-hugo/blob/0.48/dist/alpine/Dockerfile-pandoc))
* Hugo 0.47.1: `0.47.1-pandoc`, `0.47.1-pandoc-onbuild`, `0.47.1-ext-pandoc`, `0.47.1-ext-pandoc-onbuild` ([Dockerfile](https://github.com/klakegg/docker-hugo/blob/0.47.1/dist/alpine/Dockerfile-pandoc))
* Hugo 0.47: `0.47-pandoc`, `0.47-pandoc-onbuild`, `0.47-ext-pandoc`, `0.47-ext-pandoc-onbuild` ([Dockerfile](https://github.com/klakegg/docker-hugo/blob/0.47/dist/alpine/Dockerfile-pandoc))

Image based upon [Debian](https://hub.docker.com/r/_/debian/):
* Hugo 0.49.2: `0.49.2-debian`, `debian`, `0.49.2-debian-onbuild`, `debian-onbuild`, `0.49.2-ext`, `ext`, `latest-ext`, `0.49.2-ext-debian`, `ext-debian`, `0.49.2-ext-debian-onbuild`, `ext-debian-onbuild`, `0.49.2-ext-onbuild`, `ext-onbuild` ([Dockerfile](https://github.com/klakegg/docker-hugo/blob/0.49.2/dist/debian/Dockerfile-debian))
* Hugo 0.50: `0.50-debian`, `debian`, `0.50-debian-onbuild`, `debian-onbuild`, `0.50-ext`, `ext`, `latest-ext`, `0.50-ext-debian`, `ext-debian`, `0.50-ext-debian-onbuild`, `ext-debian-onbuild`, `0.50-ext-onbuild`, `ext-onbuild` ([Dockerfile](https://github.com/klakegg/docker-hugo/blob/0.50/dist/debian/Dockerfile-debian))
* Hugo 0.49.2: `0.49.2-debian`, `0.49.2-debian-onbuild`, `0.49.2-ext`, `0.49.2-ext-debian`, `0.49.2-ext-debian-onbuild`, `0.49.2-ext-onbuild` ([Dockerfile](https://github.com/klakegg/docker-hugo/blob/0.49.2/dist/debian/Dockerfile-debian))
* Hugo 0.49.1: `0.49.1-debian`, `0.49.1-debian-onbuild`, `0.49.1-ext`, `0.49.1-ext-debian`, `0.49.1-ext-debian-onbuild`, `0.49.1-ext-onbuild` ([Dockerfile](https://github.com/klakegg/docker-hugo/blob/0.49.1/dist/debian/Dockerfile-debian))
* Hugo 0.49: `0.49-debian`, `0.49-debian-onbuild`, `0.49-ext`, `0.49-ext-debian`, `0.49-ext-debian-onbuild`, `0.49-ext-onbuild` ([Dockerfile](https://github.com/klakegg/docker-hugo/blob/0.49/dist/debian/Dockerfile-debian))
* Hugo 0.48: `0.48-debian`, `0.48-debian-onbuild`, `0.48-ext`, `0.48-ext-debian`, `0.48-ext-debian-onbuild`, `0.48-ext-onbuild` ([Dockerfile](https://github.com/klakegg/docker-hugo/blob/0.48/dist/debian/Dockerfile-debian))
* Hugo 0.47.1: `0.47.1-debian`, `0.47.1-debian-onbuild`, `0.47.1-ext`, `0.47.1-ext-debian`, `0.47.1-ext-debian-onbuild`, `0.47.1-ext-onbuild` ([Dockerfile](https://github.com/klakegg/docker-hugo/blob/0.47.1/dist/debian/Dockerfile-debian))
* Hugo 0.47: `0.47-debian`, `0.47-debian-onbuild`, `0.47-ext`, `0.47-ext-debian`, `0.47-ext-debian-onbuild`, `0.47-ext-onbuild` ([Dockerfile](https://github.com/klakegg/docker-hugo/blob/0.47/dist/debian/Dockerfile-debian))

Image based upon [Ubuntu](https://hub.docker.com/r/_/ubuntu/):
* Hugo 0.49.2: `0.49.2-ubuntu`, `ubuntu`, `0.49.2-ubuntu-onbuild`, `ubuntu-onbuild`, `0.49.2-ext-ubuntu`, `ext-ubuntu`, `0.49.2-ext-ubuntu-onbuild`, `ext-ubuntu-onbuild` ([Dockerfile](https://github.com/klakegg/docker-hugo/blob/0.49.2/dist/ubuntu/Dockerfile-ubuntu))
* Hugo 0.50: `0.50-ubuntu`, `ubuntu`, `0.50-ubuntu-onbuild`, `ubuntu-onbuild`, `0.50-ext-ubuntu`, `ext-ubuntu`, `0.50-ext-ubuntu-onbuild`, `ext-ubuntu-onbuild` ([Dockerfile](https://github.com/klakegg/docker-hugo/blob/0.50/dist/ubuntu/Dockerfile-ubuntu))
* Hugo 0.49.2: `0.49.2-ubuntu`, `0.49.2-ubuntu-onbuild`, `0.49.2-ext-ubuntu`, `0.49.2-ext-ubuntu-onbuild` ([Dockerfile](https://github.com/klakegg/docker-hugo/blob/0.49.2/dist/ubuntu/Dockerfile-ubuntu))
* Hugo 0.49.1: `0.49.1-ubuntu`, `0.49.1-ubuntu-onbuild`, `0.49.1-ext-ubuntu`, `0.49.1-ext-ubuntu-onbuild` ([Dockerfile](https://github.com/klakegg/docker-hugo/blob/0.49.1/dist/ubuntu/Dockerfile-ubuntu))
* Hugo 0.49: `0.49-ubuntu`, `0.49-ubuntu-onbuild`, `0.49-ext-ubuntu`, `0.49-ext-ubuntu-onbuild` ([Dockerfile](https://github.com/klakegg/docker-hugo/blob/0.49/dist/ubuntu/Dockerfile-ubuntu))
* Hugo 0.48: `0.48-ubuntu`, `0.48-ubuntu-onbuild`, `0.48-ext-ubuntu`, `0.48-ext-ubuntu-onbuild` ([Dockerfile](https://github.com/klakegg/docker-hugo/blob/0.48/dist/ubuntu/Dockerfile-ubuntu))
Expand All @@ -74,13 +72,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.49.2
docker run --rm -it -v $(pwd):/src -v $(pwd)/output:/target klakegg/hugo:0.50
```

Run server:

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


Expand All @@ -90,7 +88,7 @@ Normal build:

```yaml
build:
image: klakegg/hugo:0.49.2
image: klakegg/hugo:0.50
volumes:
- .:/src
- ./output:/target
Expand All @@ -100,7 +98,7 @@ Run server:
```yaml
server:
image: klakegg/hugo:0.49.2
image: klakegg/hugo:0.50
command: server
volumes:
- .:/src
Expand All @@ -119,7 +117,7 @@ When Alpine images are used is bash installed as part of initiation to minimize
To get into a shell for your site:
```
docker run --rm -it -v $(pwd):/src klakegg/hugo:0.49.2-alpine shell
docker run --rm -it -v $(pwd):/src klakegg/hugo:0.50-alpine shell
```


Expand All @@ -144,7 +142,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.49.2-onbuild AS hugo
FROM klakegg/hugo:0.50-onbuild AS hugo

FROM nginx
COPY --from=hugo /onbuild /usr/share/nginx/html
Expand All @@ -162,7 +160,7 @@ The normal `pandoc` executable is renamed to `pandoc-default` to allow for later
Example of explicit setting `pandoc` alias:

```
docker run --rm -it -v $(pwd):/src -v $(pwd)/output:/src/public -e HUGO_PANDOC="pandoc-default --strip-empty-paragraphs" klakegg/hugo:0.49.2-pandoc
docker run --rm -it -v $(pwd):/src -v $(pwd)/output:/src/public -e HUGO_PANDOC="pandoc-default --strip-empty-paragraphs" klakegg/hugo:0.50-pandoc
```


Expand All @@ -173,14 +171,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.49.2
docker run --rm -it -v $(pwd):/src -v $(pwd)/output:/src/public --entrypoint hugo klakegg/hugo:0.50
```

In docker-compose using `entrypoint`:

```yaml
build:
image: klakegg/hugo:0.49.2
image: klakegg/hugo:0.50
entrypoint: hugo
volumes:
- .:/src
Expand Down
Loading

0 comments on commit 60c2af2

Please sign in to comment.