Skip to content

Commit 1ffc187

Browse files
rustatianrustatian
authored
[#2315]: release: v2025.1.9
2 parents afc5f0b + c013778 commit 1ffc187

File tree

4 files changed

+113
-99
lines changed

4 files changed

+113
-99
lines changed

‎.dockerignore‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,3 +8,8 @@
88
/bin
99
composer.json
1010
vendor_php
11+
Makefile
12+
CHANGELOG.md
13+
LICENSE
14+
.golangci*
15+
.rr-sample-*.yaml

‎Dockerfile‎

Lines changed: 17 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -6,27 +6,27 @@ FROM --platform=${TARGETPLATFORM:-linux/amd64} golang:1.26-alpine AS builder
66
ARG APP_VERSION="undefined"
77
ARG BUILD_TIME="undefined"
88

9-
COPY . /src
10-
119
WORKDIR /src
1210

11+
# Copy module files first for layer caching
12+
COPY go.mod go.sum ./
13+
RUN go mod download
14+
15+
# Copy source and build
16+
COPY . .
17+
1318
# arguments to pass on each go tool link invocation
1419
ENV LDFLAGS="-s \
1520
-X github.com/roadrunner-server/roadrunner/v2025/internal/meta.version=$APP_VERSION \
1621
-X github.com/roadrunner-server/roadrunner/v2025/internal/meta.buildTime=$BUILD_TIME"
1722

18-
# compile binary file
19-
RUN set -x
20-
RUN go mod download
21-
RUN go mod tidy
22-
RUN CGO_ENABLED=0 go build -trimpath -ldflags "$LDFLAGS" -o ./rr ./cmd/rr
23-
RUN ./rr -v
23+
# compile and verify binary
24+
RUN CGO_ENABLED=0 go build -trimpath -ldflags "$LDFLAGS" -o ./rr ./cmd/rr && ./rr -v
2425

26+
# ---- Final stage ----
2527
FROM --platform=${TARGETPLATFORM:-linux/amd64} alpine:3
2628

27-
RUN apk upgrade --update-cache --available && \
28-
apk add openssl && \
29-
rm -rf /var/cache/apk/*
29+
RUN apk upgrade --no-cache && apk add --no-cache ca-certificates
3030

3131
# use same build arguments for image labels
3232
ARG APP_VERSION="undefined"
@@ -42,9 +42,15 @@ LABEL org.opencontainers.image.version="$APP_VERSION"
4242
LABEL org.opencontainers.image.created="$BUILD_TIME"
4343
LABEL org.opencontainers.image.licenses="MIT"
4444

45+
# Non-root user
46+
RUN addgroup -S rr && adduser -S -G rr rr
47+
4548
# copy required files from builder image
4649
COPY --from=builder /src/rr /usr/bin/rr
4750
COPY --from=builder /src/.rr.yaml /etc/rr.yaml
4851

52+
USER rr
53+
4954
# use roadrunner binary as image entrypoint
5055
ENTRYPOINT ["/usr/bin/rr"]
56+
CMD ["serve", "-c", "/etc/rr.yaml"]

‎go.mod‎

Lines changed: 31 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/roadrunner-server/roadrunner/v2025
22

3-
go 1.26
3+
go 1.26.1
44

55
require (
66
github.com/buger/goterm v1.0.4
@@ -20,7 +20,7 @@ require (
2020
github.com/roadrunner-server/fileserver/v5 v5.1.9
2121
github.com/roadrunner-server/google-pub-sub/v5 v5.1.9
2222
github.com/roadrunner-server/goridge/v3 v3.8.3
23-
github.com/roadrunner-server/grpc/v5 v5.2.3
23+
github.com/roadrunner-server/grpc/v5 v5.3.0
2424
github.com/roadrunner-server/gzip/v5 v5.3.0
2525
github.com/roadrunner-server/headers/v5 v5.2.0
2626
github.com/roadrunner-server/http/v5 v5.3.0
@@ -71,23 +71,24 @@ require (
7171
cloud.google.com/go/iam v1.5.3 // indirect
7272
cloud.google.com/go/pubsub/v2 v2.4.0 // indirect
7373
github.com/andybalholm/brotli v1.2.0 // indirect
74-
github.com/aws/aws-sdk-go-v2 v1.41.2 // indirect
75-
github.com/aws/aws-sdk-go-v2/config v1.32.10 // indirect
76-
github.com/aws/aws-sdk-go-v2/credentials v1.19.10 // indirect
77-
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.18 // indirect
78-
github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.18 // indirect
79-
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.18 // indirect
80-
github.com/aws/aws-sdk-go-v2/internal/ini v1.8.4 // indirect
81-
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.5 // indirect
82-
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.18 // indirect
83-
github.com/aws/aws-sdk-go-v2/service/signin v1.0.6 // indirect
84-
github.com/aws/aws-sdk-go-v2/service/sqs v1.42.22 // indirect
85-
github.com/aws/aws-sdk-go-v2/service/sso v1.30.11 // indirect
86-
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.35.15 // indirect
87-
github.com/aws/aws-sdk-go-v2/service/sts v1.41.7 // indirect
74+
github.com/aws/aws-sdk-go-v2 v1.41.3 // indirect
75+
github.com/aws/aws-sdk-go-v2/config v1.32.11 // indirect
76+
github.com/aws/aws-sdk-go-v2/credentials v1.19.11 // indirect
77+
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.19 // indirect
78+
github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.19 // indirect
79+
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.19 // indirect
80+
github.com/aws/aws-sdk-go-v2/internal/ini v1.8.5 // indirect
81+
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.6 // indirect
82+
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.19 // indirect
83+
github.com/aws/aws-sdk-go-v2/service/signin v1.0.7 // indirect
84+
github.com/aws/aws-sdk-go-v2/service/sqs v1.42.23 // indirect
85+
github.com/aws/aws-sdk-go-v2/service/sso v1.30.12 // indirect
86+
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.35.16 // indirect
87+
github.com/aws/aws-sdk-go-v2/service/sts v1.41.8 // indirect
8888
github.com/aws/smithy-go v1.24.2 // indirect
8989
github.com/beanstalkd/go-beanstalk v0.2.0 // indirect
9090
github.com/beorn7/perks v1.0.1 // indirect
91+
github.com/bmatcuk/doublestar/v4 v4.10.0 // indirect
9192
github.com/bradfitz/gomemcache v0.0.0-20250403215159-8d39553ac7cf // indirect
9293
github.com/cactus/go-statsd-client/v5 v5.1.0 // indirect
9394
github.com/caddyserver/certmagic v0.25.2 // indirect
@@ -107,7 +108,7 @@ require (
107108
github.com/go-logr/stdr v1.2.2 // indirect
108109
github.com/go-ole/go-ole v1.3.0 // indirect
109110
github.com/go-viper/mapstructure/v2 v2.5.0 // indirect
110-
github.com/goccy/go-json v0.10.5 // indirect
111+
github.com/goccy/go-json v0.10.6 // indirect
111112
github.com/gofiber/fiber/v2 v2.52.12 // indirect
112113
github.com/gogo/protobuf v1.3.2 // indirect
113114
github.com/golang/mock v1.7.0-rc.1 // indirect
@@ -205,19 +206,19 @@ require (
205206
go.uber.org/zap/exp v0.3.0 // indirect
206207
go.yaml.in/yaml/v2 v2.4.4 // indirect
207208
go.yaml.in/yaml/v3 v3.0.4 // indirect
208-
golang.org/x/crypto v0.48.0 // indirect
209-
golang.org/x/mod v0.33.0 // indirect
210-
golang.org/x/net v0.51.0 // indirect
211-
golang.org/x/oauth2 v0.35.0 // indirect
212-
golang.org/x/sync v0.19.0 // indirect
213-
golang.org/x/sys v0.41.0 // indirect
214-
golang.org/x/text v0.34.0 // indirect
215-
golang.org/x/time v0.14.0 // indirect
216-
golang.org/x/tools v0.42.0 // indirect
217-
google.golang.org/api v0.269.0 // indirect
218-
google.golang.org/genproto v0.0.0-20260226221140-a57be14db171 // indirect
219-
google.golang.org/genproto/googleapis/api v0.0.0-20260226221140-a57be14db171 // indirect
220-
google.golang.org/genproto/googleapis/rpc v0.0.0-20260226221140-a57be14db171 // indirect
209+
golang.org/x/crypto v0.49.0 // indirect
210+
golang.org/x/mod v0.34.0 // indirect
211+
golang.org/x/net v0.52.0 // indirect
212+
golang.org/x/oauth2 v0.36.0 // indirect
213+
golang.org/x/sync v0.20.0 // indirect
214+
golang.org/x/sys v0.42.0 // indirect
215+
golang.org/x/text v0.35.0 // indirect
216+
golang.org/x/time v0.15.0 // indirect
217+
golang.org/x/tools v0.43.0 // indirect
218+
google.golang.org/api v0.271.0 // indirect
219+
google.golang.org/genproto v0.0.0-20260311181403-84a4fc48630c // indirect
220+
google.golang.org/genproto/googleapis/api v0.0.0-20260311181403-84a4fc48630c // indirect
221+
google.golang.org/genproto/googleapis/rpc v0.0.0-20260311181403-84a4fc48630c // indirect
221222
google.golang.org/grpc v1.79.2 // indirect
222223
google.golang.org/protobuf v1.36.11 // indirect
223224
gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect

0 commit comments

Comments
 (0)