From 783a51a784d7ec058d09cc8ae44c974176f291a9 Mon Sep 17 00:00:00 2001 From: Keegan Carruthers-Smith Date: Thu, 18 Apr 2024 16:50:16 +0200 Subject: [PATCH] docker: use go1.22 and alpine3.19 go.mod requires go1.22. This should fix the build step on main. Test Plan: monitor CI --- Dockerfile | 6 +++--- Dockerfile.indexserver | 2 +- Dockerfile.webserver | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index f8cdcee3..86c246ee 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.21.4-alpine3.18 AS builder +FROM 1.22.2-alpine3.19 AS builder RUN apk add --no-cache ca-certificates @@ -13,7 +13,7 @@ COPY . ./ ARG VERSION RUN go install -ldflags "-X github.com/sourcegraph/zoekt.Version=$VERSION" ./cmd/... -FROM rust:alpine3.18 AS rust-builder +FROM rust:alpine3.19 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.18 AS zoekt +FROM alpine:3.19 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 44c86768..b4e9f08d 100644 --- a/Dockerfile.indexserver +++ b/Dockerfile.indexserver @@ -1,4 +1,4 @@ -FROM alpine:3.18 +FROM alpine:3.19 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 adf20c7e..0a477fc4 100644 --- a/Dockerfile.webserver +++ b/Dockerfile.webserver @@ -1,4 +1,4 @@ -FROM alpine:3.18 +FROM alpine:3.19 RUN apk update --no-cache && apk upgrade --no-cache && \ apk add --no-cache ca-certificates bind-tools tini