From 9db6641efd46f48a3596409009f8001bad4d5917 Mon Sep 17 00:00:00 2001
From: Adin Schmahmann <adin.schmahmann@gmail.com>
Date: Wed, 8 Jun 2022 15:33:06 -0400
Subject: [PATCH] chore: bump Go to 1.18.3 (#9021)

---
 .circleci/main.yml | 10 +++++-----
 Dockerfile         |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.circleci/main.yml b/.circleci/main.yml
index 18c5d55cd81..49591d50c30 100644
--- a/.circleci/main.yml
+++ b/.circleci/main.yml
@@ -37,7 +37,7 @@ default_environment: &default_environment
 executors:
   golang:
     docker:
-      - image: cimg/go:1.18.1
+      - image: cimg/go:1.18.3
     working_directory: ~/ipfs/go-ipfs
     environment:
       <<: *default_environment
@@ -62,7 +62,7 @@ executors:
       E2E_IPFSD_TYPE: go
   dockerizer:
     docker:
-      - image: cimg/go:1.18.1
+      - image: cimg/go:1.18.3
     environment:
       IMAGE_NAME: ipfs/go-ipfs
       WIP_IMAGE_TAG: wip
@@ -162,8 +162,8 @@ jobs:
     - run: sudo apt update
     - run: |
         mkdir ~/localgo && cd ~/localgo
-        wget https://golang.org/dl/go1.18.1.linux-amd64.tar.gz
-        tar xfz go1.18.1.linux-amd64.tar.gz
+        wget https://golang.org/dl/go1.18.3.linux-amd64.tar.gz
+        tar xfz go1.18.3.linux-amd64.tar.gz
         echo "export PATH=$(pwd)/go/bin:\$PATH" >> ~/.bashrc
     - run: go version
     - run: sudo apt install socat net-tools
@@ -229,7 +229,7 @@ jobs:
       - *store_gomod
   interop:
     docker:
-      - image: cimg/go:1.18.1-node
+      - image: cimg/go:1.18.3-node
     parallelism: 4
     resource_class: large
     steps:
diff --git a/Dockerfile b/Dockerfile
index 81d43825270..913cde19b68 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,5 @@
 # Note: when updating the go minor version here, also update the go-channel in snap/snapcraft.yml
-FROM golang:1.18.1-buster
+FROM golang:1.18.3-buster
 LABEL maintainer="Steven Allen <steven@stebalien.com>"
 
 # Install deps