From 37631d74b4337b308689df4cead4da8ec6a84d28 Mon Sep 17 00:00:00 2001
From: ymmt <ymmt2005@gmail.com>
Date: Sun, 31 Jan 2021 13:39:36 +0000
Subject: [PATCH] Build with Go 1.15 on Ubuntu 20.04

---
 .circleci/config.yml | 2 +-
 docker/Dockerfile    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 9f404c5b..1500d64b 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -62,7 +62,7 @@ commands:
 jobs:
   build:
     docker:
-      - image: quay.io/cybozu/golang:1.13-bionic
+      - image: quay.io/cybozu/golang:1.15-focal
       - image: quay.io/coreos/etcd:v3.3
     steps:
       - checkout
diff --git a/docker/Dockerfile b/docker/Dockerfile
index c042bdeb..e940fad1 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -1,5 +1,5 @@
 # Sabakan container
-FROM quay.io/cybozu/ubuntu:18.04
+FROM quay.io/cybozu/ubuntu:20.04
 
 RUN apt-get update \
     && apt-get -y install --no-install-recommends grub-ipxe \