From 2323d6fd1ebb9e3d7130e37ecf0b0290ea0d21ea Mon Sep 17 00:00:00 2001
From: Manfred Touron <94029+moul@users.noreply.github.com>
Date: Wed, 19 Aug 2020 18:30:10 +0200
Subject: [PATCH] chore: go1.15

---
 .circleci/config.yml     | 3 ++-
 .github/workflows/ci.yml | 6 +++---
 Dockerfile               | 2 +-
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 8856259..f0f8aab 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1,7 +1,7 @@
 defaults: &defaults
   working_directory: /go/src/moul.io/sshportal
   docker:
-    - image: circleci/golang:1.14.7
+    - image: circleci/golang:1.15.0
   environment:
     GO111MODULE: "on"
 
@@ -27,6 +27,7 @@ jobs:
             curl -L https://github.com/docker/compose/releases/download/1.11.4/docker-compose-`uname -s`-`uname -m` > ~/docker-compose
       - setup_remote_docker:
           docker_layer_caching: true
+          version: 18.09.3 # https://github.com/golang/go/issues/40893
       - *install_retry
       - run: /tmp/retry -m 3 docker build -t moul/sshportal .
       - run: /tmp/retry -m 3 make integration
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 6130aa5..caf9c1e 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -30,8 +30,7 @@ jobs:
     strategy:
       matrix:
         golang:
-          #- 1.13
-          - 1.14
+          - 1.15.0
     steps:
       - uses: actions/checkout@v2
       - name: Install Go
@@ -47,7 +46,7 @@ jobs:
     strategy:
       matrix:
         golang:
-          - 1.14
+          - 1.15.0
     steps:
       - uses: actions/checkout@v2
       - name: Install Go
@@ -72,6 +71,7 @@ jobs:
           - 1.12
           - 1.13
           - 1.14
+          - 1.15.0
     steps:
       - uses: actions/checkout@v2
       - name: Install Go
diff --git a/Dockerfile b/Dockerfile
index f40768c..1118d91 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,5 @@
 # build
-FROM golang:1.14.7 as builder
+FROM golang:1.15.0 as builder
 ENV             GO111MODULE=on
 WORKDIR         /go/src/moul.io/sshportal
 COPY            go.mod go.sum ./