Merge pull request #647 from q384566678/add-go1.10

travis: add go 1.10

Author: liangchenye

.travis.yml

@@ -3,6 +3,7 @@ go:
   - 1.7.x
   - 1.8.x
   - 1.9.x
+  - 1.10.x
 
 sudo: false
 

Makefile

@@ -6,7 +6,7 @@ BUILDTAGS=
 RUNTIME ?= runc
 COMMIT=$(shell git rev-parse HEAD 2> /dev/null || true)
 VERSION := ${shell cat ./VERSION}
-VALIDATION_TESTS ?= $(patsubst %.go,%.t,$(wildcard validation/*.go))
+VALIDATION_TESTS ?= $(patsubst %.go,%.t,$(shell find ./validation/ -name *.go | grep -v util))
 
 all: tool runtimetest validation-executables
 

api/socket/socket.go

@@ -1,22 +1,22 @@
 package socket
 
-// Message is the normal data for messages passed on the console socket.
-type Message struct {
+// Common is the normal data for messages passed on the console socket.
+type Common struct {
 	// Type of message being passed
 	Type string `json:"type"`
 }
 
 // TerminalRequest is the normal data for messages passing a pseudoterminal master.
 type TerminalRequest struct {
-	Message
+	Common
 
 	// Container ID for the container whose pseudoterminal master is being set.
 	Container string `json:"container"`
 }
 
 // Response is the normal data for response messages.
 type Response struct {
-	Message
+	Common
 
 	// Message is a phrase describing the response.
 	Message string `json:"message,omitempty"`