Skip to content

Commit

Permalink
docker: use go1.22 and alpine3.19
Browse files Browse the repository at this point in the history
go.mod requires go1.22. This should fix the build step on main.

Test Plan: monitor CI
  • Loading branch information
keegancsmith committed Apr 18, 2024
1 parent 74e75ef commit 783a51a
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
6 changes: 3 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -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

Expand All @@ -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
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.indexserver
Original file line number Diff line number Diff line change
@@ -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 && \
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.webserver
Original file line number Diff line number Diff line change
@@ -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
Expand Down

0 comments on commit 783a51a

Please sign in to comment.