From 0d0992e6a2c94948189e84e5f599773eceaba4db Mon Sep 17 00:00:00 2001
From: Scott Blum <dragonsinth@gmail.com>
Date: Mon, 25 Jul 2022 11:54:27 -0400
Subject: [PATCH] Add go 1.18 support; set Dockerfile to go 1.18 (#325)

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

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 2e4ee54..4501d21 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -5,7 +5,12 @@ shared_configs:
         name: Run tests
         command: |
           make deps test
-
+  full_job_steps: &full_job_steps
+    - checkout
+    - run:
+        name: Run tests
+        command: |
+          make ci
 
 # Use the latest 2.1 version of CircleCI pipeline process engine. See: https://circleci.com/docs/2.0/configuration-reference
 version: 2.1
@@ -13,38 +18,25 @@ jobs:
   build-1-15:
     working_directory: ~/repo
     docker:
-      - image: circleci/golang:1.15
+      - image: cimg/go:1.15
     steps: *simple_job_steps
 
   build-1-16:
     working_directory: ~/repo
     docker:
-      - image: circleci/golang:1.16
-    steps:
-      - checkout
-      - restore_cache:
-          keys:
-            - go-mod-v4-{{ checksum "go.sum" }}
-      - run:
-          name: Install Dependencies
-          command: go mod download
-      - save_cache:
-          key: go-mod-v4-{{ checksum "go.sum" }}
-          paths:
-            - "/go/pkg/mod"
-      - run:
-          name: Run tests
-          command: |
-            #mkdir -p /tmp/test-reports
-            #gotestsum --junitfile /tmp/test-reports/unit-tests.xml
-            make ci
-    #- store_test_results:
-    #    path: /tmp/test-reports
+      - image: cimg/go:1.16
+    steps: *full_job_steps
 
   build-1-17:
     working_directory: ~/repo
     docker:
-      - image: circleci/golang:1.17
+      - image: cimg/go:1.17
+    steps: *simple_job_steps
+
+  build-1-18:
+    working_directory: ~/repo
+    docker:
+      - image: cimg/go:1.18
     steps: *simple_job_steps
 
 workflows:
@@ -53,3 +45,4 @@ workflows:
       - build-1-15
       - build-1-16
       - build-1-17
+      - build-1-18
diff --git a/Dockerfile b/Dockerfile
index 72044ed..0ec7104 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.15-alpine as builder
+FROM golang:1.18-alpine as builder
 MAINTAINER FullStory Engineering
 
 # create non-privileged group and user