Skip to content

Commit f075960

Browse files
terminaldwellerterminaldweller
committed
fixes #26, fixes #28, fixes #37, fixes #38 
1 parent 8fd3bf7 commit f075960

14 files changed

+635
-526
lines changed

‎.golangci.yml

+1
Original file line numberDiff line numberDiff line change
@@ -28,3 +28,4 @@ linters-settings:
2828
- gitlab.com/megalithic-llc/gluasocket
2929
- github.com/layeh/gopher-json
3030
- github.com/mmcdole/gofeed
31+
- github.com/cenkalti/backoff/v5

‎Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
FROM golang:1.22-alpine3.20 AS builder
1+
FROM golang:1.23-alpine3.21 AS builder
22
WORKDIR /milla
33
COPY go.sum go.mod /milla/
44
RUN go mod download
55
COPY *.go /milla/
66
RUN go build
77

8-
FROM alpine:3.20
8+
FROM alpine:3.21
99
ENV HOME /home/user
1010
RUN set -eux; \
1111
adduser -u 1001 -D -h "$HOME" user; \

‎Dockerfile_debug

+14
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
FROM golang:1.23-alpine3.21 AS builder
2+
WORKDIR /milla
3+
COPY go.sum go.mod /milla/
4+
COPY vendor /milla/vendor
5+
COPY *.go /milla/
6+
RUN CGO_ENABLED=0 go build
7+
8+
FROM golang:1.23-alpine3.21 AS debug
9+
RUN CGO_ENABLED=0 go install -ldflags "-s -w -extldflags '-static'" github.com/go-delve/delve/cmd/dlv@latest
10+
11+
FROM alpine:3.21
12+
COPY --from=debug /go/bin/dlv /usr/bin/dlv
13+
COPY --from=builder /milla/milla "/usr/bin/milla"
14+
ENTRYPOINT ["/usr/bin/dlv"]

‎Dockerfile_distroless

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM golang:1.22-alpine3.20 AS builder
1+
FROM golang:1.23-alpine3.21 AS builder
22
WORKDIR /milla
33
COPY go.sum go.mod /milla/
44
RUN go mod download

‎Dockerfile_distroless_vendored

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM golang:1.22-alpine3.20 AS builder
1+
FROM golang:1.23-alpine3.21 AS builder
22
WORKDIR /milla
33
COPY go.sum go.mod /milla/
44
COPY vendor /milla/vendor

‎README.md

+96-317
Large diffs are not rendered by default.

‎go.mod

+24-21
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,14 @@
11
module milla
22

3-
go 1.22.3
3+
go 1.23
4+
5+
toolchain go1.23.4
46

57
require (
68
github.com/BurntSushi/toml v0.3.1
79
github.com/ailncode/gluaxmlpath v0.0.0-20161126153117-6ce478ecb4a6
810
github.com/alecthomas/chroma/v2 v2.12.0
11+
github.com/cenkalti/backoff/v5 v5.0.1
912
github.com/cjoudrey/gluahttp v0.0.0-20201111170219-25003d9adfa9
1013
github.com/google/generative-ai-go v0.11.2
1114
github.com/jackc/pgx/v5 v5.5.5
@@ -17,17 +20,17 @@ require (
1720
github.com/yuin/gluare v0.0.0-20170607022532-d7c94f1a80ed
1821
github.com/yuin/gopher-lua v1.1.1
1922
gitlab.com/megalithic-llc/gluasocket v0.3.1
20-
golang.org/x/net v0.24.0
21-
google.golang.org/api v0.176.1
23+
golang.org/x/net v0.26.0
24+
google.golang.org/api v0.186.0
2225
)
2326

2427
require (
25-
cloud.google.com/go v0.112.1 // indirect
26-
cloud.google.com/go/ai v0.4.0 // indirect
27-
cloud.google.com/go/auth v0.3.0 // indirect
28+
cloud.google.com/go v0.115.0 // indirect
29+
cloud.google.com/go/ai v0.8.0 // indirect
30+
cloud.google.com/go/auth v0.6.0 // indirect
2831
cloud.google.com/go/auth/oauth2adapt v0.2.2 // indirect
2932
cloud.google.com/go/compute/metadata v0.3.0 // indirect
30-
cloud.google.com/go/longrunning v0.5.6 // indirect
33+
cloud.google.com/go/longrunning v0.5.7 // indirect
3134
github.com/PuerkitoBio/goquery v1.8.0 // indirect
3235
github.com/andybalholm/cascadia v1.3.1 // indirect
3336
github.com/dlclark/regexp2 v1.10.0 // indirect
@@ -39,7 +42,7 @@ require (
3942
github.com/google/s2a-go v0.1.7 // indirect
4043
github.com/google/uuid v1.6.0 // indirect
4144
github.com/googleapis/enterprise-certificate-proxy v0.3.2 // indirect
42-
github.com/googleapis/gax-go/v2 v2.12.4 // indirect
45+
github.com/googleapis/gax-go/v2 v2.12.5 // indirect
4346
github.com/jackc/pgpassfile v1.0.0 // indirect
4447
github.com/jackc/pgservicefile v0.0.0-20221227161230-091c0ba34f0a // indirect
4548
github.com/jackc/puddle/v2 v2.2.1 // indirect
@@ -50,21 +53,21 @@ require (
5053
github.com/modern-go/reflect2 v1.0.2 // indirect
5154
github.com/rogpeppe/go-internal v1.12.0 // indirect
5255
go.opencensus.io v0.24.0 // indirect
53-
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0 // indirect
54-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect
55-
go.opentelemetry.io/otel v1.24.0 // indirect
56-
go.opentelemetry.io/otel/metric v1.24.0 // indirect
57-
go.opentelemetry.io/otel/trace v1.24.0 // indirect
58-
golang.org/x/crypto v0.22.0 // indirect
59-
golang.org/x/oauth2 v0.19.0 // indirect
56+
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.51.0 // indirect
57+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.51.0 // indirect
58+
go.opentelemetry.io/otel v1.26.0 // indirect
59+
go.opentelemetry.io/otel/metric v1.26.0 // indirect
60+
go.opentelemetry.io/otel/trace v1.26.0 // indirect
61+
golang.org/x/crypto v0.24.0 // indirect
62+
golang.org/x/oauth2 v0.21.0 // indirect
6063
golang.org/x/sync v0.7.0 // indirect
61-
golang.org/x/sys v0.19.0 // indirect
62-
golang.org/x/text v0.14.0 // indirect
64+
golang.org/x/sys v0.21.0 // indirect
65+
golang.org/x/text v0.16.0 // indirect
6366
golang.org/x/time v0.5.0 // indirect
64-
google.golang.org/genproto/googleapis/api v0.0.0-20240415180920-8c6c420018be // indirect
65-
google.golang.org/genproto/googleapis/rpc v0.0.0-20240415180920-8c6c420018be // indirect
66-
google.golang.org/grpc v1.63.2 // indirect
67-
google.golang.org/protobuf v1.33.0 // indirect
67+
google.golang.org/genproto/googleapis/api v0.0.0-20240617180043-68d350f18fd4 // indirect
68+
google.golang.org/genproto/googleapis/rpc v0.0.0-20240617180043-68d350f18fd4 // indirect
69+
google.golang.org/grpc v1.64.1 // indirect
70+
google.golang.org/protobuf v1.34.2 // indirect
6871
gopkg.in/xmlpath.v2 v2.0.0-20150820204837-860cbeca3ebc // indirect
6972
gopkg.in/yaml.v2 v2.4.0 // indirect
7073
)

0 commit comments

Comments
 (0)