Skip to content
This repository has been archived by the owner on May 30, 2018. It is now read-only.

update hugo to 0.26 #3

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,4 @@
*~
gogs.tar.gz
binary.tar.gz
content/*
14 changes: 5 additions & 9 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,21 +1,17 @@
FROM hypriot/rpi-alpine-scratch

MAINTAINER Andreas Eiermann <[email protected]>
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
10 changes: 5 additions & 5 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -14,18 +14,18 @@ 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 && \
mv hugo*/hugo* ./hugo
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
Expand Down
3 changes: 2 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.14
0.26