From 73762c6f9da74a9590423269349decd5b09bce32 Mon Sep 17 00:00:00 2001 From: arekkas Date: Sun, 29 Apr 2018 18:09:15 +0200 Subject: [PATCH] build: Updates to Go 1.10 --- .circleci/config.yml | 8 ++++---- Dockerfile | 2 +- Dockerfile-alpine | 2 +- oauth2/session.go | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index b3844fb3097..3a9e3bf0ad5 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -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 @@ -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 @@ -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 @@ -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 diff --git a/Dockerfile b/Dockerfile index 5d898fc23f9..25a3da6f0cc 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.9-alpine +FROM golang:1.10-alpine ARG git_tag ARG git_commit diff --git a/Dockerfile-alpine b/Dockerfile-alpine index 32d746cdcc5..aa721a95abb 100644 --- a/Dockerfile-alpine +++ b/Dockerfile-alpine @@ -1,4 +1,4 @@ -FROM golang:1.9-alpine +FROM golang:1.10-alpine ARG git_tag ARG git_commit diff --git a/oauth2/session.go b/oauth2/session.go index 2993427a034..c116be9045e 100644 --- a/oauth2/session.go +++ b/oauth2/session.go @@ -29,7 +29,7 @@ import ( type Session struct { *openid.DefaultSession `json:"idToken"` - Audience []string + Audience []string Extra map[string]interface{} `json:"extra"` }