From e59043028403f2a262d29b04000870f4b62312d7 Mon Sep 17 00:00:00 2001
From: grembold <olaf.ob.blume@gmail.com>
Date: Thu, 31 Aug 2017 21:08:20 +0200
Subject: [PATCH] update hugo to 0.26

---
 .gitignore |  2 ++
 Dockerfile | 14 +++++---------
 Makefile   | 10 +++++-----
 README.md  |  3 ++-
 VERSION    |  2 +-
 5 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/.gitignore b/.gitignore
index 8315578..121098a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,4 @@
 *~
 gogs.tar.gz
+binary.tar.gz
+content/*
diff --git a/Dockerfile b/Dockerfile
index 6fed541..c4caf07 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,21 +1,17 @@
 FROM hypriot/rpi-alpine-scratch
 
 MAINTAINER Andreas Eiermann <andreas@hypriot.com>
-LABEL version="alpine linux version: 3.2\r\nhugo version: 0.14"
-ENV HUGO_VERSION=0.14
+LABEL version="alpine linux version: 3.6\r\nhugo version: 0.26"
+ENV HUGO_VERSION=0.26
  
-# set alpine to version 3.2 instead of edge
-RUN echo "http://nl.alpinelinux.org/alpine/v3.1/main" > /etc/apk/repositories
+# set alpine to version 3.6 instead of edge
+RUN echo "http://nl.alpinelinux.org/alpine/v3.6/main" > /etc/apk/repositories
 
 RUN apk update && \
 apk add openssh git && \
 rm -rf /var/cache/apk/*
-#apk upgrade && \
 
 ADD content/hugo /usr/local/bin/hugo
 WORKDIR /www/
 ENTRYPOINT ["hugo"]
-EXPOSE 1313
-
-#ENTRYPOINT ["/bin/bash","-s","-c"]
-#CMD ["hugo"]
+EXPOSE 1313
\ No newline at end of file
diff --git a/Makefile b/Makefile
index 898beb0..64ad472 100644
--- a/Makefile
+++ b/Makefile
@@ -14,7 +14,7 @@ loadS3_and_extract:
 	ls -la content/
 
 download:
-	curl -L https://github.com/spf13/hugo/releases/download/v$(VERSION)/hugo_$(VERSION)_linux_arm.tar.gz > ./binary.tar.gz
+	curl -L https://github.com/gohugoio/hugo/releases/download/v$(VERSION)/hugo_$(VERSION)_Linux-ARM.tar.gz > ./binary.tar.gz
 	mkdir content/
 	tar xzf binary.tar.gz -C content/
 	cd content && \
@@ -22,10 +22,10 @@ download:
 	ls -la content/
 
 dockerbuild:
-	docker rmi -f $(NAMESPACE)/$(IMAGENAME):bak || true
-	docker tag $(NAMESPACE)/$(IMAGENAME) $(NAMESPACE)/$(IMAGENAME):bak || true
-	docker rmi -f $(NAMESPACE)/$(IMAGENAME) || true
-	docker build -t $(NAMESPACE)/$(IMAGENAME) .
+	docker rmi -f $(NAMESPACE)/$(IMAGENAME):$(VERSION)_bak || true
+	docker tag $(NAMESPACE)/$(IMAGENAME) $(NAMESPACE)/$(IMAGENAME):$(VERSION)_bak || true
+	docker rmi -f $(NAMESPACE)/$(IMAGENAME):$(VERSION) || true
+	docker build -t $(NAMESPACE)/$(IMAGENAME):$(VERSION) .
 
 testimg:
 	docker rm -f new-$(IMAGENAME) || true
diff --git a/README.md b/README.md
index 40d3a40..9b5db26 100644
--- a/README.md
+++ b/README.md
@@ -46,7 +46,8 @@ Run all the commands from within the project root directory.
 
 ### Build the Docker Image
 ```bash
-make dockerbuild
+make download
+NAMESPACE=hypriot make dockerbuild
 ```
 
 #### Push the Docker Image to the Docker Hub
diff --git a/VERSION b/VERSION
index c64601b..9922215 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.14
\ No newline at end of file
+0.26