Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Image upgrade #262

Merged
merged 2 commits into from
Oct 15, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@ jobs:
- name: checkout code
uses: actions/checkout@v4
- name: golangci-lint
if: matrix.go-version == '1.22.x'
if: matrix.go-version == '1.23.x'
uses: golangci/golangci-lint-action@v6
with:
version: v1.59
version: v1.61.0
- name: test
run: make test
5 changes: 3 additions & 2 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
module github.com/bookingcom/nanotube

go 1.21
toolchain go1.22.5
go 1.22.0

toolchain go1.23.2

require (
github.com/RussellLuo/slidingwindow v0.0.0-20200528002341-535bb99d338b
Expand Down
2 changes: 1 addition & 1 deletion test/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.20
FROM golang:1.23

RUN mkdir /nanotube
WORKDIR /nanotube
Expand Down
4 changes: 2 additions & 2 deletions test/k8s/nt.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
FROM golang:1.20.0-alpine as builder
FROM golang:1.23.2-alpine3.20 as builder

RUN apk add git
WORKDIR /nt
COPY . .
# TODO: Add version embedding.
RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build ./cmd/nanotube

FROM alpine:3.13
FROM alpine:3.20
WORKDIR /nt

COPY --from=builder /nt/nanotube /nt
Expand Down
4 changes: 2 additions & 2 deletions test/k8s/sender.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
FROM golang:1.20.0-alpine as builder
FROM golang:1.23.2-alpine3.20 as builder

RUN apk add git
WORKDIR /nt
COPY . .
RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build ./test/sender

FROM alpine:3.13
FROM alpine:3.20
WORKDIR /nt

COPY --from=builder /nt/sender /nt
Expand Down
Loading