Merge branch 'remove-unsupported-go-version' into 'master'

Go 1.8 is the minimum supported version

Closes #70

See merge request !36

3 files changed, 10 insertions, 28 deletions

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c3a2fb80..8d056620 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -8,24 +8,6 @@ before_script:
 - ln -sfv "$(pwd -P)" "$GODIR"
 - cd "$GODIR"
 
-test:1.5:
-  image: golang:1.5
-  script:
-  - make verify-lite
-  - make acceptance
-
-test:1.6:
-  image: golang:1.6
-  script:
-  - make verify
-  - make acceptance
-
-test:1.7:
-  image: golang:1.7
-  script:
-  - make verify
-  - make acceptance
-
 test:1.8:
   image: golang:1.8
   script:
diff --git a/Makefile b/Makefile
index a097bd21..dbedf313 100644
--- a/Makefile
+++ b/Makefile
@@ -10,7 +10,6 @@ endif
 GO_LDFLAGS ?= -X main.VERSION=$(VERSION) -X main.REVISION=$(REVISION)
 GO_FILES ?= $(shell find . -name '*.go')
 
-export GO15VENDOREXPERIMENT := 1
 export CGO_ENABLED := 0
 
 all: gitlab-pages
@@ -21,8 +20,7 @@ gitlab-pages: $(GO_FILES)
 update:
 	godep save ./...
 
-verify-lite: fmt vet complexity test # lint does not work on go1.5 any more
-verify: verify-lite lint
+verify: fmt vet complexity lint test
 
 fmt:
 	go fmt ./... | awk '{ print "Please run go fmt"; exit 1 }'
diff --git a/README.md b/README.md
index c453095d..35054303 100644
--- a/README.md
+++ b/README.md
@@ -5,6 +5,7 @@
 [![coverage report](https://gitlab.com/gitlab-org/gitlab-pages/badges/master/coverage.svg)](https://gitlab.com/gitlab-org/gitlab-pages/commits/master)
 
 This is simple HTTP server written in Go made to serve GitLab Pages with CNAMEs and SNI using HTTP/HTTP2.
+The minimum supported Go version is 1.8.
 
 This is made to work in small-to-medium scale environments.
 In large environment it can be time consuming to list all directories, and CNAMEs.
@@ -43,8 +44,8 @@ If load balancer is run in SSL-offloading mode the custom TLS certificate will n
 
 Example:
 ```
-CGO_ENABLED=0 GO15VENDOREXPERIMENT=1 go build
-./gitlab-pages -listen-https "" -listen-http ":8090" -pages-root path/to/gitlab/shared/pages -pages-domain example.com
+$ make
+$ ./gitlab-pages -listen-https "" -listen-http ":8090" -pages-root path/to/gitlab/shared/pages -pages-domain example.com
 ```
 
 ### Run daemon **in secure mode**
@@ -63,8 +64,8 @@ This make it possible to listen on privileged ports and makes it harded the proc
 
 Example:
 ```
-go build
-sudo ./gitlab-pages -listen-http ":80" -pages-root path/to/gitlab/shared/pages -pages-domain example.com -daemon-uid 1000 -daemon-gid 1000
+$ make
+$ sudo ./gitlab-pages -listen-http ":80" -pages-root path/to/gitlab/shared/pages -pages-domain example.com -daemon-uid 1000 -daemon-gid 1000
 ```
 
 ### Listen on multiple ports
@@ -73,8 +74,8 @@ Each of the `listen-http`, `listen-https` and `listen-proxy` arguments can be pr
 
 Example:
 ```
-go build
-./gitlab-pages -listen-http "10.0.0.1:8080" -listen-https "[fd00::1]:8080" -pages-root path/to/gitlab/shared/pages -pages-domain example.com
+$ make
+$ ./gitlab-pages -listen-http "10.0.0.1:8080" -listen-https "[fd00::1]:8080" -pages-root path/to/gitlab/shared/pages -pages-domain example.com
 ```
 
 This is most useful in dual-stack environments (IPv4+IPv6) where both Gitlab Pages and another HTTP server have to co-exist on the same server.
@@ -87,7 +88,8 @@ application for [Prometheus](https://prometheus.io/) to scrape.
 
 Example:
 ```
-./gitlab-pages -listen-http ":8090" -metrics-address ":9235" -pages-root path/to/gitlab/shared/pages -pages-domain example.com
+$ make
+$ ./gitlab-pages -listen-http ":8090" -metrics-address ":9235" -pages-root path/to/gitlab/shared/pages -pages-domain example.com
 ```
 
 ### Cross-origin requests