Skip to content

Commit

Permalink
Use Go 1.21.2 (#653)
Browse files Browse the repository at this point in the history
  • Loading branch information
abitrolly authored Oct 6, 2023
1 parent cc1b5cd commit 8c5bd7d
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 7 deletions.
1 change: 1 addition & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ on:
branches:
- main
pull_request:
workflow_dispatch:
name: CI
jobs:
test:
Expand Down
2 changes: 1 addition & 1 deletion .tool-versions
Original file line number Diff line number Diff line change
@@ -1 +1 @@
golang 1.20.3
golang 1.21.2
8 changes: 4 additions & 4 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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
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.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
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.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 && \
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.17.3
FROM alpine:3.18

RUN apk update --no-cache && apk upgrade --no-cache && \
apk add --no-cache ca-certificates bind-tools tini
Expand Down

0 comments on commit 8c5bd7d

Please sign in to comment.