Skip to content

Commit

Permalink
build: Updates to Go 1.10
Browse files Browse the repository at this point in the history
  • Loading branch information
arekkas authored and arekkas committed Apr 29, 2018
1 parent d72efbf commit 73762c6
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 7 deletions.
8 changes: 4 additions & 4 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ version: 2
jobs:
format:
docker:
- image: circleci/golang:1.9
- image: circleci/golang:1.10
working_directory: /go/src/github.com/ory/hydra
steps:
- checkout
Expand All @@ -16,7 +16,7 @@ jobs:

test:
docker:
- image: circleci/golang:1.9
- image: circleci/golang:1.10
environment:
- TEST_DATABASE_POSTGRESQL=postgres://test:test@localhost:5432/hydra?sslmode=disable
- TEST_DATABASE_MYSQL=root:test@(localhost:3306)/mysql?parseTime=true
Expand All @@ -42,7 +42,7 @@ jobs:

swagger:
docker:
- image: circleci/golang:1.9
- image: circleci/golang:1.10
working_directory: /go/src/github.com/ory/hydra
steps:
- checkout
Expand All @@ -68,7 +68,7 @@ jobs:

release:
docker:
- image: circleci/golang:1.9
- image: circleci/golang:1.10
working_directory: /go/src/github.com/ory/hydra
steps:
- checkout
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.9-alpine
FROM golang:1.10-alpine

ARG git_tag
ARG git_commit
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile-alpine
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.9-alpine
FROM golang:1.10-alpine

ARG git_tag
ARG git_commit
Expand Down
2 changes: 1 addition & 1 deletion oauth2/session.go
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ import (

type Session struct {
*openid.DefaultSession `json:"idToken"`
Audience []string
Audience []string
Extra map[string]interface{} `json:"extra"`
}

Expand Down

0 comments on commit 73762c6

Please sign in to comment.