Skip to content
This repository has been archived by the owner on Apr 21, 2021. It is now read-only.

Commit

Permalink
Merge pull request opencontainers#647 from q384566678/add-go1.10
Browse files Browse the repository at this point in the history
travis: add go 1.10
  • Loading branch information
liangchenye authored Jun 28, 2018
2 parents 80195d8 + 06591d3 commit fef2a70
Show file tree
Hide file tree
Showing 57 changed files with 6 additions and 5 deletions.
1 change: 1 addition & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ go:
- 1.7.x
- 1.8.x
- 1.9.x
- 1.10.x

sudo: false

Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
8 changes: 4 additions & 4 deletions api/socket/socket.go
Original file line number Diff line number Diff line change
@@ -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"`
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 comments on commit fef2a70

Please sign in to comment.