docker: Bump golang to 1.12.0 (#1293)

https://golang.org/doc/go1.12 Signed-off-by: Shota SAWADA <xiootas@gmail.com>
ory · Feb 28, 2019 · f6db6d3 · f6db6d3
1 parent e0d3b0d
commit f6db6d3
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 23 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -5,20 +5,20 @@ version: 2
 jobs:
   format:
     docker:
-      - image: circleci/golang:1.11
+      - image: circleci/golang:1.12
     working_directory: /go/src/github.com/ory/hydra
     steps:
 # This is disabled for now because goimports is really slow when go modules are used, see
 # https://github.com/golang/go/issues/27287
 #
 #      - run:
-#          name: Enable go1.11 modules
+#          name: Enable go1.12 modules
 #          command: |
 #            echo 'export GO111MODULE=on' >> $BASH_ENV
 #            source $BASH_ENV
       - checkout
       - run:
-          name: Enable go1.11 modules
+          name: Enable go1.12 modules
           command: |
             echo 'export GO111MODULE=on' >> $BASH_ENV
             source $BASH_ENV
@@ -30,7 +30,7 @@ jobs:
 
   test:
     docker:
-      - image: circleci/golang:1.11
+      - image: circleci/golang:1.12
         environment:
         - TEST_DATABASE_POSTGRESQL=postgres://test:test@localhost:5432/hydra?sslmode=disable
         - TEST_DATABASE_MYSQL=root:test@(localhost:3306)/mysql?parseTime=true
@@ -45,21 +45,21 @@ jobs:
     working_directory: /go/src/github.com/ory/hydra
     steps:
       - run:
-          name: Enable go1.11 modules
+          name: Enable go1.12 modules
           command: |
             echo 'export GO111MODULE=on' >> $BASH_ENV
             source $BASH_ENV
       - checkout
       - run: go mod download
-      - run: go get -u github.com/mattn/goveralls golang.org/x/tools/cmd/cover github.com/ory/go-acc
+      - run: go get -u github.com/mattn/goveralls github.com/ory/go-acc
       - run: go-acc -o coverage.txt ./... -- -failfast -timeout=20m
 #      Running race conditions requires parallel tests, otherwise it's worthless (which is the case)
 #      - run: go test -race -short $(go list ./... | grep -v cmd)
       - run: test -z "$CIRCLE_PR_NUMBER" && goveralls -service=circle-ci -coverprofile=coverage.txt -repotoken=$COVERALLS_REPO_TOKEN || echo "forks are not allowed to push to coveralls"
 
   test-e2e-opaque:
     docker:
-    - image: circleci/golang:1.11
+    - image: circleci/golang:1.12
       environment:
       - DATABASE_URL_POSTGRES=postgres://test:test@localhost:5432/hydra?sslmode=disable
       - DATABASE_URL_MYSQL=mysql://root:test@(localhost:3306)/mysql?parseTime=true
@@ -74,7 +74,7 @@ jobs:
     working_directory: /go/src/github.com/ory/hydra
     steps:
     - run:
-        name: Enable go1.11 modules
+        name: Enable go1.12 modules
         command: |
           echo 'export GO111MODULE=on' >> $BASH_ENV
           source $BASH_ENV
@@ -90,11 +90,11 @@ jobs:
 
   test-e2e-plugin:
     docker:
-    - image: circleci/golang:1.11
+    - image: circleci/golang:1.12
     working_directory: /go/src/github.com/ory/hydra
     steps:
     - run:
-        name: Enable go1.11 modules
+        name: Enable go1.12 modules
         command: |
           echo 'export GO111MODULE=on' >> $BASH_ENV
           source $BASH_ENV
@@ -106,7 +106,7 @@ jobs:
 
   test-e2e-jwt:
     docker:
-    - image: circleci/golang:1.11
+    - image: circleci/golang:1.12
       environment:
       - DATABASE_URL_POSTGRES=postgres://test:test@localhost:5432/hydra?sslmode=disable
       - DATABASE_URL_MYSQL=mysql://root:test@(localhost:3306)/mysql?parseTime=true
@@ -121,7 +121,7 @@ jobs:
     working_directory: /go/src/github.com/ory/hydra
     steps:
     - run:
-        name: Enable go1.11 modules
+        name: Enable go1.12 modules
         command: |
           echo 'export GO111MODULE=on' >> $BASH_ENV
           source $BASH_ENV
@@ -138,15 +138,15 @@ jobs:
 # This test is really useless because there are always changes (usually timestamps in the generated code)
 #  generators:
 #    docker:
-#      - image: circleci/golang:1.11
+#      - image: circleci/golang:1.12
 #    working_directory: /go/src/github.com/ory/hydra
 #    steps:
 #      - checkout
 #      - run: sudo apt-get update -y
 #      - run: sudo apt-get install -y default-jdk
 #      - run: make init
 #      - run:
-#          name: Enable go1.11 modules
+#          name: Enable go1.12 modules
 #          command: |
 #            echo 'export GO111MODULE=on' >> $BASH_ENV
 #            source $BASH_ENV
@@ -171,11 +171,11 @@ jobs:
 
   release-docker:
     docker:
-      - image: circleci/golang:1.11
+      - image: circleci/golang:1.12
     working_directory: /go/src/github.com/ory/hydra
     steps:
       - run:
-          name: Enable go1.11 modules
+          name: Enable go1.12 modules
           command: |
             echo 'export GO111MODULE=on' >> $BASH_ENV
             source $BASH_ENV
@@ -202,11 +202,11 @@ jobs:
 
   release-binaries:
     docker:
-      - image: circleci/golang:1.11
+      - image: circleci/golang:1.12
     working_directory: /go/src/github.com/ory/hydra
     steps:
       - run:
-          name: Enable go1.11 modules
+          name: Enable go1.12 modules
           command: |
             echo 'export GO111MODULE=on' >> $BASH_ENV
             source $BASH_ENV
@@ -248,11 +248,11 @@ jobs:
 
   benchmark:
     docker:
-      - image: circleci/golang:1.11
+      - image: circleci/golang:1.12
     working_directory: /go/src/github.com/ory/hydra
     steps:
       - run:
-          name: Enable go1.11 modules
+          name: Enable go1.12 modules
           command: |
             echo 'export GO111MODULE=on' >> $BASH_ENV
             source $BASH_ENV

diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.11.5-alpine
+FROM golang:1.12.0-alpine
 
 ARG git_tag
 ARG git_commit

diff --git a/Dockerfile-alpine b/Dockerfile-alpine
@@ -1,4 +1,4 @@
-FROM golang:1.11.5-alpine
+FROM golang:1.12.0-alpine
 
 ARG git_tag
 ARG git_commit

diff --git a/go.mod b/go.mod
@@ -85,7 +85,7 @@ require (
 	go.uber.org/atomic v1.3.2 // indirect
 	go4.org v0.0.0-20190218023631-ce4c26f7be8e // indirect
 	golang.org/x/build v0.0.0-20190227044025-202164ea31fc // indirect
-	golang.org/x/crypto v0.0.0-20190225124518-7f87c0fbb88b
+	golang.org/x/crypto v0.0.0-20190227175134-215aa809caaf
 	golang.org/x/exp v0.0.0-20190221220918-438050ddec5e // indirect
 	golang.org/x/net v0.0.0-20190227022144-312bce6e941f // indirect
 	golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421

diff --git a/go.sum b/go.sum
@@ -376,6 +376,8 @@ golang.org/x/crypto v0.0.0-20190211182817-74369b46fc67 h1:ng3VDlRp5/DHpSWl02R4rM
 golang.org/x/crypto v0.0.0-20190211182817-74369b46fc67/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
 golang.org/x/crypto v0.0.0-20190225124518-7f87c0fbb88b h1:+/WWzjwW6gidDJnMKWLKLX1gxn7irUTF1fLpQovfQ5M=
 golang.org/x/crypto v0.0.0-20190225124518-7f87c0fbb88b/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
+golang.org/x/crypto v0.0.0-20190227175134-215aa809caaf h1:CGelmUfSfeZpx2Pu+OznGcS0ff71WZ/ZOEkhMAB4hVQ=
+golang.org/x/crypto v0.0.0-20190227175134-215aa809caaf/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20190221220918-438050ddec5e/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/lint v0.0.0-20180702182130-06c8688daad7/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
@@ -427,6 +429,7 @@ golang.org/x/sys v0.0.0-20181029174526-d69651ed3497/go.mod h1:STP8DvDyc/dI5b8T5h
 golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20181122145206-62eef0e2fa9b/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20181218192612-074acd46bca6/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190226215855-775f8194d0f9/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=