From 03cc31fb70dbaf62940270f558fe01f715313868 Mon Sep 17 00:00:00 2001
From: James Hillyerd <james@hillyerd.com>
Date: Mon, 4 Jul 2022 16:23:06 -0700
Subject: [PATCH] Build with Go 1.18

---
 .github/workflows/build-and-test.yml | 2 +-
 .github/workflows/release.yml        | 2 +-
 Dockerfile                           | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
index 76f0f48..062c437 100644
--- a/.github/workflows/build-and-test.yml
+++ b/.github/workflows/build-and-test.yml
@@ -6,7 +6,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        go: [ '1.17', '1.16' ]
+        go: [ '1.18', '1.17' ]
     name: Go ${{ matrix.go }} build
     steps:
       - uses: actions/checkout@v2
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 66ca39e..ea28c84 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -14,7 +14,7 @@ jobs:
       - name: Setup Go
         uses: actions/setup-go@v2
         with:
-          go-version: 1.17
+          go-version: 1.18
       - name: Setup Node.js
         uses: actions/setup-node@v3
         with:
diff --git a/Dockerfile b/Dockerfile
index a2aecbd..57e50c6 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -11,7 +11,7 @@ RUN yarn install --frozen-lockfile --non-interactive
 RUN yarn run build
 
 ### Build backend
-FROM golang:1.17-alpine3.14 as backend
+FROM golang:1.18-alpine3.16 as backend
 RUN apk add --no-cache --virtual .build-deps g++ git make
 WORKDIR /build
 COPY . .
@@ -22,7 +22,7 @@ RUN go build -o inbucket \
   -v ./cmd/inbucket
 
 ### Run in minimal image
-FROM alpine:3.14
+FROM alpine:3.16
 RUN apk --no-cache add tzdata
 WORKDIR /opt/inbucket
 RUN mkdir bin defaults ui