Skip to content

Commit 4cacfb6

Browse files
authored
chore: hardening docker image (#76)
Signed-off-by: Francesco Casula <fra.casula@gmail.com>
1 parent 566869e commit 4cacfb6

File tree

5 files changed

+9
-13
lines changed

5 files changed

+9
-13
lines changed

.github/workflows/verify.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,5 +59,5 @@ jobs:
5959
- name: golangci-lint
6060
uses: golangci/golangci-lint-action@v8
6161
with:
62-
version: v2.3.1
62+
version: v2.5.0
6363
args: -v

Dockerfile

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
11
# Define build arguments
22
# GO_VERSION is updated automatically to match go.mod, see Makefile
3-
ARG GO_VERSION=1.24.6
4-
ARG ALPINE_VERSION=3.22
53
ARG PKG_NAME=github.com/rudderlabs/keydb
64

75
# Build stage
8-
FROM golang:${GO_VERSION}-alpine${ALPINE_VERSION} AS builder
6+
FROM golang:1.25.3-alpine3.22@sha256:20ee0b674f987514ae3afb295b6a2a4e5fa11de8cc53a289343bbdab59b0df59 AS builder
97

108
# Install necessary dependencies (zstd-dev used with cgo)
119
RUN apk --no-cache add --update make tzdata ca-certificates gcc musl-dev zstd-dev
@@ -38,7 +36,7 @@ RUN go build \
3836
-o ./keydb ./cmd/node
3937

4038
# Final stage
41-
FROM alpine:${ALPINE_VERSION}
39+
FROM alpine:3.22.2@sha256:4b7ce07002c69e8f3d704a9c5d6fd3053be500b7f1c69fc0d80990c2ad8dd412
4240

4341
# Update and install additional packages (zstd-libs used with cgo)
4442
RUN apk --no-cache upgrade && \

Dockerfile-scaler

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
11
# Define build arguments
22
# GO_VERSION is updated automatically to match go.mod, see Makefile
3-
ARG GO_VERSION=1.24.6
4-
ARG ALPINE_VERSION=3.22
53
ARG PKG_NAME=github.com/rudderlabs/keydb
64

75
# Build stage
8-
FROM golang:${GO_VERSION}-alpine${ALPINE_VERSION} AS builder
6+
FROM golang:1.25.3-alpine3.22@sha256:20ee0b674f987514ae3afb295b6a2a4e5fa11de8cc53a289343bbdab59b0df59 AS builder
97

108
# Install necessary dependencies
119
RUN apk --no-cache add --update make tzdata ca-certificates gcc musl-dev
@@ -35,7 +33,7 @@ RUN go build \
3533
-o ./keydb-scaler ./cmd/scaler
3634

3735
# Final stage
38-
FROM alpine:${ALPINE_VERSION}
36+
FROM alpine:3.22.2@sha256:4b7ce07002c69e8f3d704a9c5d6fd3053be500b7f1c69fc0d80990c2ad8dd412
3937

4038
# Update and install additional packages
4139
RUN apk --no-cache upgrade && \

Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@ GO := go
22
TESTFILE := _testok
33
DOCKER_USER :=
44

5-
GOLANG_CI := github.com/golangci/golangci-lint/v2/cmd/golangci-lint@v2.3.1
5+
GOLANG_CI := github.com/golangci/golangci-lint/v2/cmd/golangci-lint@v2.5.0
66
GOFUMPT := mvdan.cc/gofumpt@latest
77
GOVULNCHECK := golang.org/x/vuln/cmd/govulncheck@latest
88
GOIMPORTS := golang.org/x/tools/cmd/goimports@latest
9-
MOCKGEN := github.com/golang/mock/mockgen@v1.6.0
10-
GOTESTSUM := gotest.tools/gotestsum@v1.11.0
9+
MOCKGEN := go.uber.org/mock/mockgen@v0.6.0
10+
GOTESTSUM := gotest.tools/gotestsum@v1.13.0
1111

1212
# go tools versions
1313
protoc-gen-go=google.golang.org/protobuf/cmd/protoc-gen-go@v1.36.6

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/rudderlabs/keydb
22

3-
go 1.24.6
3+
go 1.25.3
44

55
require (
66
github.com/DataDog/zstd v1.5.7

0 commit comments

Comments
 (0)