Bump to 0.37.

klakegg · Feb 27, 2018 · fb8c2a0 · fb8c2a0
1 parent 025f17e
commit fb8c2a0
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 17 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,6 +1,6 @@
 FROM busybox:1.28 AS fetch
 
-ARG VERSION=0.36.1
+ARG VERSION=0.37
 
 RUN echo "Version: ${VERSION}"
 ADD https://github.com/gohugoio/hugo/releases/download/v${VERSION}/hugo_${VERSION}_Linux-64bit.tar.gz /hugo.tar.gz

diff --git a/Dockerfile-alpine b/Dockerfile-alpine
@@ -1,6 +1,6 @@
 FROM busybox:1.28 AS fetch
 
-ARG VERSION=0.36.1
+ARG VERSION=0.37
 
 RUN echo "Version: ${VERSION}"
 ADD https://github.com/gohugoio/hugo/releases/download/v${VERSION}/hugo_${VERSION}_Linux-64bit.tar.gz /hugo.tar.gz

diff --git a/README.md b/README.md
@@ -8,19 +8,22 @@ 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.36.1: `0.36.1-busybox`, `busybox`, `0.36.1`, `latest` ([Dockerfile](https://github.com/klakegg/docker-hugo/blob/0.36.1/Dockerfile))
+* Hugo 0.37: `0.37-busybox`, `busybox`, `0.37`, `latest` ([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.36.1: `0.36.1-alpine`, `alpine` ([Dockerfile](https://github.com/klakegg/docker-hugo/blob/0.36.1/Dockerfile-alpine))
+* Hugo 0.37: `0.37-alpine`, `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.36.1: `0.36.1-asciidoctor`, `asciidoctor` ([Dockerfile](https://github.com/klakegg/docker-hugo/blob/0.36.1/Dockerfile-asciidoctor))
+* Hugo 0.37: `0.37-asciidoctor`, `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))
 * 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))
@@ -37,11 +40,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.36.1```
+```docker run --rm -it -v $(pwd):/src -v $(pwd)/output:/target klakegg/hugo:0.37```
 
 Run server:
 
-```docker run --rm -it -v $(pwd):/src -p 1313:1313 klakegg/hugo:0.36.1 server```
+```docker run --rm -it -v $(pwd):/src -p 1313:1313 klakegg/hugo:0.37 server```
 
 
 ### docker-compose
@@ -50,7 +53,7 @@ Normal build:
 
 ```
   build:
-    image: klakegg/hugo:0.36.1
+    image: klakegg/hugo:0.37
     volumes:
       - .:/src
       - ./output:/target
@@ -60,7 +63,7 @@ Run server:
 
 ```
   server:
-    image: klakegg/hugo:0.36.1
+    image: klakegg/hugo:0.37
     command: server
     volumes:
       - .:/src
@@ -75,13 +78,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.36.1```
+```docker run --rm -it -v $(pwd):/src -v $(pwd)/output:/target --entrypoint hugo klakegg/hugo:0.37```
 
 In docker-compose using `entrypoint`:
 
 ```
   build:
-    image: klakegg/hugo:0.36.1
+    image: klakegg/hugo:0.37
     entrypoint: hugo
     volumes:
       - .:/src

diff --git a/hooks/post_push b/hooks/post_push
@@ -20,22 +20,18 @@ case "$DOCKER_TAG" in
     ;;
 
     "alpine")
+        docker tag $IMAGE_NAME klakegg/hugo:alpine
+
         docker tag $IMAGE_NAME $DOCKER_REPO:$SOURCE_BRANCH-alpine
         docker push $DOCKER_REPO:$SOURCE_BRANCH-alpine
 
         # Generate image for Asciidoctor
 
-        docker tag $IMAGE_NAME klakegg/hugo:alpine
         docker build -t $DOCKER_REPO:asciidoctor -f Dockerfile-asciidoctor .
         docker push $DOCKER_REPO:asciidoctor
 
         docker tag $DOCKER_REPO:asciidoctor $DOCKER_REPO:$SOURCE_BRANCH-asciidoctor
         docker push $DOCKER_REPO:$SOURCE_BRANCH-asciidoctor
     ;;
 
-    "asciidoctor")
-        docker tag $IMAGE_NAME $DOCKER_REPO:$SOURCE_BRANCH-asciidoctor
-        docker push $DOCKER_REPO:$SOURCE_BRANCH-asciidoctor
-    ;;
-
 esac