From 1e4e500dc119b6f895744d16680ab5ca7991d491 Mon Sep 17 00:00:00 2001
From: Hidde Beydals <hello@hidde.co>
Date: Mon, 30 May 2022 13:18:39 +0200
Subject: [PATCH] Update Go to 1.18

This is required for the latest Azure SDK, and comes with general
improvements for certain CPU types.

Includes a change of `%w` -> `%v` for `t.Errorf` due to dropped support
for wrapping.

Signed-off-by: Hidde Beydals <hello@hidde.co>
---
 .github/workflows/cli.yml     | 4 ++--
 .github/workflows/release.yml | 4 ++--
 Dockerfile                    | 2 +-
 Dockerfile.alpine             | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/cli.yml b/.github/workflows/cli.yml
index 90b64f87f..2fb1f1a73 100644
--- a/.github/workflows/cli.yml
+++ b/.github/workflows/cli.yml
@@ -28,10 +28,10 @@ jobs:
     steps:
       - name: Install dependencies
         run: sudo apt-get update && sudo apt-get install git -y
-      - name: Set up Go 1.17
+      - name: Set up Go 1.18
         uses: actions/setup-go@v2
         with:
-          go-version: 1.17
+          go-version: 1.18
         id: go
       - name: Check out code into the Go module directory
         uses: actions/checkout@v2
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index a2e8a00a1..c8d2a78a9 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -15,10 +15,10 @@ jobs:
         run: sudo apt-get update && sudo apt-get install git ruby rpm -y
       - name: Install fpm
         run: gem install fpm || sudo gem install fpm
-      - name: Set up Go 1.17
+      - name: Set up Go 1.18
         uses: actions/setup-go@v2
         with:
-          go-version: 1.17
+          go-version: 1.18
         id: go
       - name: Check out code into the Go module directory
         uses: actions/checkout@v2
diff --git a/Dockerfile b/Dockerfile
index 00d47c285..8f75f5799 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.17
+FROM golang:1.18
 
 COPY . /go/src/go.mozilla.org/sops
 WORKDIR /go/src/go.mozilla.org/sops
diff --git a/Dockerfile.alpine b/Dockerfile.alpine
index 2c2d591b2..c7d3227ee 100644
--- a/Dockerfile.alpine
+++ b/Dockerfile.alpine
@@ -1,4 +1,4 @@
-FROM golang:1.17-alpine3.15 AS builder
+FROM golang:1.18-alpine3.16 AS builder
 
 RUN apk --no-cache add make