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