Minor, long due updates

* Logo updated
* (c) updated
* Fixed a null pointer
* Added backoff for when Docker is not immediately ready
* Updated dependencies

Author: cimnine

README.md

@@ -237,7 +237,7 @@ systemctl restart nscd
 
 ## Development
 
-We depend on at least Go 1.11.
+This projects requires Go 1.11 or newer.
 
 There is a `Makefile` with targets for any common task.
 

docker/client.go

@@ -24,7 +24,10 @@ func (client *Client) Launch() error {
 	}
 	client.dockerClient = dockerClient
 
-	client.updateContainers()
+	err = client.updateContainers()
+	if err != nil {
+		return err
+	}
 
 	listener := make(chan *docker.APIEvents)
 	err = dockerClient.AddEventListener(listener)
@@ -50,6 +53,10 @@ func (client *Client) Launch() error {
 
 // handles an event emitted by Docker
 func (client *Client) handleEvent(event *docker.APIEvents) error {
+	if event == nil {
+		return nil
+	}
+
 	if event.Type != "container" {
 		return nil
 	}

go.mod

@@ -1,17 +1,28 @@
 module github.com/ninech/reception
 
+replace github.com/Sirupsen/logrus v1.4.2 => github.com/sirupsen/logrus v1.4.1
+
 require (
-	github.com/GeertJohan/go.incremental v0.0.0-20161212213043-1172aab96510 // indirect
-	github.com/GeertJohan/go.rice v0.0.0-20170420135705-c02ca9a983da
-	github.com/akavel/rsrc v0.0.0-20170831122431-f6a15ece2cfd // indirect
-	github.com/daaku/go.zipexe v0.0.0-20150329023125-a5fe2436ffcb // indirect
-	github.com/fsouza/go-dockerclient v1.3.1
-	github.com/jessevdk/go-flags v1.4.0 // indirect
-	github.com/kardianos/osext v0.0.0-20170510131534-ae77be60afb1 // indirect
-	github.com/miekg/dns v1.0.13
-	github.com/tdewolff/minify v2.3.5+incompatible
-	github.com/tdewolff/parse v2.3.3+incompatible // indirect
-	github.com/tdewolff/test v0.0.0-20171106182207-265427085153 // indirect
-	golang.org/x/lint v0.0.0-20181011164241-5906bd5c48cd // indirect
-	golang.org/x/tools v0.0.0-20181013145246-13216ffa54f0 // indirect
+	github.com/GeertJohan/go.rice v1.0.0
+	github.com/cenkalti/backoff v2.2.1+incompatible
+	github.com/containerd/continuity v0.0.0-20190827140505-75bee3e2ccb6 // indirect
+	github.com/daaku/go.zipexe v1.0.1 // indirect
+	github.com/fsouza/go-dockerclient v1.4.4
+	github.com/gogo/protobuf v1.3.0 // indirect
+	github.com/konsorten/go-windows-terminal-sequences v1.0.2 // indirect
+	github.com/kr/pretty v0.1.0 // indirect
+	github.com/miekg/dns v1.1.16
+	github.com/sirupsen/logrus v1.4.2 // indirect
+	github.com/stretchr/testify v1.4.0 // indirect
+	github.com/tdewolff/minify v2.3.6+incompatible
+	github.com/tdewolff/parse v2.3.4+incompatible // indirect
+	github.com/tdewolff/test v1.0.3 // indirect
+	golang.org/x/crypto v0.0.0-20190829043050-9756ffdc2472 // indirect
+	golang.org/x/net v0.0.0-20190827160401-ba9fcec4b297 // indirect
+	golang.org/x/sys v0.0.0-20190830142957-1e83adbbebd0 // indirect
+	golang.org/x/text v0.3.2 // indirect
+	google.golang.org/appengine v1.4.0 // indirect
+	google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55 // indirect
+	google.golang.org/grpc v1.23.0 // indirect
+	gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 // indirect
 )

go.sum

@@ -1,6 +1,7 @@
 package http
 
 import (
+	"github.com/tdewolff/minify/html"
 	"html/template"
 	"io"
 	"net/http"
@@ -12,7 +13,6 @@ import (
 	"github.com/ninech/reception/common"
 	"github.com/tdewolff/minify"
 	"github.com/tdewolff/minify/css"
-	"github.com/tdewolff/minify/html"
 	"github.com/tdewolff/minify/js"
 
 	"github.com/GeertJohan/go.rice"

http/handler.go

@@ -3,14 +3,14 @@ package main
 import (
 	"flag"
 	"fmt"
-	net_http "net/http"
-	"runtime"
-
+	"github.com/cenkalti/backoff"
 	miekg_dns "github.com/miekg/dns"
 	"github.com/ninech/reception/common"
 	"github.com/ninech/reception/dns"
 	"github.com/ninech/reception/docker"
 	"github.com/ninech/reception/http"
+	net_http "net/http"
+	"runtime"
 )
 
 var config = &common.Config{
@@ -56,6 +56,7 @@ func BoolFlag(p *bool, name string, value bool, usage string) {
 
 func main() {
 	fmt.Println("(c) 2017-2018 Nine Internet Solutions AG")
+	fmt.Println("(c) 2018-2019 nxt Engineering GmbH")
 
 	flag.Parse()
 
@@ -67,7 +68,10 @@ func main() {
 	go runHttpFrontend()
 	go runDns()
 
-	runDockerClient()
+	err := backoff.Retry(runDockerClient, backoff.NewExponentialBackOff())
+	if err != nil {
+		panic(err)
+	}
 }
 
 func runDns() {
@@ -92,14 +96,11 @@ func runDns() {
 	}
 }
 
-func runDockerClient() {
+func runDockerClient() error {
 	client := docker.Client{
 		Config: config,
 	}
-	err := client.Launch()
-	if err != nil {
-		panic(err)
-	}
+	return client.Launch()
 }
 
 func runHttpFrontend() {