From 8c5bd7de9403534e839a993bb4afa82b6cded047 Mon Sep 17 00:00:00 2001
From: Anatoli Babenia <anatoli@rainforce.org>
Date: Fri, 6 Oct 2023 19:10:42 +0300
Subject: [PATCH] Use Go 1.21.2 (#653)

---
 .github/workflows/ci.yml | 1 +
 .tool-versions           | 2 +-
 Dockerfile               | 8 ++++----
 Dockerfile.indexserver   | 2 +-
 Dockerfile.webserver     | 2 +-
 5 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index a06f85f9a..8f93baf9a 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -3,6 +3,7 @@ on:
     branches:
       - main
   pull_request:
+  workflow_dispatch:
 name: CI
 jobs:
   test:
diff --git a/.tool-versions b/.tool-versions
index 850d43e16..ff2d56269 100644
--- a/.tool-versions
+++ b/.tool-versions
@@ -1 +1 @@
-golang 1.20.3
+golang 1.21.2
diff --git a/Dockerfile b/Dockerfile
index fd4baf409..e8ae503ca 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,8 +1,8 @@
-FROM golang:1.20.3-alpine3.17 AS builder
+FROM golang:1.21.2-alpine3.18 AS builder
 
 RUN apk add --no-cache ca-certificates
 
-ENV CGO_ENABLED=0 GO111MODULE=on
+ENV CGO_ENABLED=0
 WORKDIR /go/src/github.com/sourcegraph/zoekt
 
 # Cache dependencies
@@ -13,7 +13,7 @@ COPY . ./
 ARG VERSION
 RUN go install -ldflags "-X github.com/sourcegraph/zoekt.Version=$VERSION" ./cmd/...
 
-FROM rust:alpine3.17 AS rust-builder
+FROM rust:alpine3.18 AS rust-builder
 
 RUN apk update --no-cache && apk upgrade --no-cache && \
     apk add --no-cache git wget musl-dev>=1.1.24-r10 build-base
@@ -27,7 +27,7 @@ RUN cd sourcegraph/docker-images/syntax-highlighter && /sourcegraph/cmd/symbols/
 
 RUN cargo install --path sourcegraph/docker-images/syntax-highlighter --root /syntect_server --bin scip-ctags
 
-FROM alpine:3.17.3 AS zoekt
+FROM alpine:3.18 AS zoekt
 
 RUN apk update --no-cache && apk upgrade --no-cache && \
     apk add --no-cache git ca-certificates bind-tools tini jansson wget
diff --git a/Dockerfile.indexserver b/Dockerfile.indexserver
index 8f8be6ed6..44c86768e 100644
--- a/Dockerfile.indexserver
+++ b/Dockerfile.indexserver
@@ -1,4 +1,4 @@
-FROM alpine:3.17.3
+FROM alpine:3.18
 
 RUN apk update --no-cache && apk upgrade --no-cache && \
     apk add --no-cache ca-certificates bind-tools tini 'git>=2.38.5-r0' jansson && \
diff --git a/Dockerfile.webserver b/Dockerfile.webserver
index b18fb6991..adf20c7ed 100644
--- a/Dockerfile.webserver
+++ b/Dockerfile.webserver
@@ -1,4 +1,4 @@
-FROM alpine:3.17.3
+FROM alpine:3.18
 
 RUN apk update --no-cache && apk upgrade --no-cache && \
    apk add --no-cache ca-certificates bind-tools tini