Skip to content

Commit

Permalink
fixes #26, fixes #28, fixes #37, fixes #38
Browse files Browse the repository at this point in the history
  • Loading branch information
terminaldweller committed Feb 7, 2025
1 parent 8fd3bf7 commit f075960
Show file tree
Hide file tree
Showing 14 changed files with 635 additions and 526 deletions.
1 change: 1 addition & 0 deletions .golangci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,3 +28,4 @@ linters-settings:
- gitlab.com/megalithic-llc/gluasocket
- github.com/layeh/gopher-json
- github.com/mmcdole/gofeed
- github.com/cenkalti/backoff/v5
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
FROM golang:1.22-alpine3.20 AS builder
FROM golang:1.23-alpine3.21 AS builder
WORKDIR /milla
COPY go.sum go.mod /milla/
RUN go mod download
COPY *.go /milla/
RUN go build

FROM alpine:3.20
FROM alpine:3.21
ENV HOME /home/user
RUN set -eux; \
adduser -u 1001 -D -h "$HOME" user; \
Expand Down
14 changes: 14 additions & 0 deletions Dockerfile_debug
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
FROM golang:1.23-alpine3.21 AS builder
WORKDIR /milla
COPY go.sum go.mod /milla/
COPY vendor /milla/vendor
COPY *.go /milla/
RUN CGO_ENABLED=0 go build

FROM golang:1.23-alpine3.21 AS debug
RUN CGO_ENABLED=0 go install -ldflags "-s -w -extldflags '-static'" github.com/go-delve/delve/cmd/dlv@latest

FROM alpine:3.21
COPY --from=debug /go/bin/dlv /usr/bin/dlv
COPY --from=builder /milla/milla "/usr/bin/milla"
ENTRYPOINT ["/usr/bin/dlv"]
2 changes: 1 addition & 1 deletion Dockerfile_distroless
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.22-alpine3.20 AS builder
FROM golang:1.23-alpine3.21 AS builder
WORKDIR /milla
COPY go.sum go.mod /milla/
RUN go mod download
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile_distroless_vendored
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.22-alpine3.20 AS builder
FROM golang:1.23-alpine3.21 AS builder
WORKDIR /milla
COPY go.sum go.mod /milla/
COPY vendor /milla/vendor
Expand Down
413 changes: 96 additions & 317 deletions README.md

Large diffs are not rendered by default.

45 changes: 24 additions & 21 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,11 +1,14 @@
module milla

go 1.22.3
go 1.23

toolchain go1.23.4

require (
github.com/BurntSushi/toml v0.3.1
github.com/ailncode/gluaxmlpath v0.0.0-20161126153117-6ce478ecb4a6
github.com/alecthomas/chroma/v2 v2.12.0
github.com/cenkalti/backoff/v5 v5.0.1
github.com/cjoudrey/gluahttp v0.0.0-20201111170219-25003d9adfa9
github.com/google/generative-ai-go v0.11.2
github.com/jackc/pgx/v5 v5.5.5
Expand All @@ -17,17 +20,17 @@ require (
github.com/yuin/gluare v0.0.0-20170607022532-d7c94f1a80ed
github.com/yuin/gopher-lua v1.1.1
gitlab.com/megalithic-llc/gluasocket v0.3.1
golang.org/x/net v0.24.0
google.golang.org/api v0.176.1
golang.org/x/net v0.26.0
google.golang.org/api v0.186.0
)

require (
cloud.google.com/go v0.112.1 // indirect
cloud.google.com/go/ai v0.4.0 // indirect
cloud.google.com/go/auth v0.3.0 // indirect
cloud.google.com/go v0.115.0 // indirect
cloud.google.com/go/ai v0.8.0 // indirect
cloud.google.com/go/auth v0.6.0 // indirect
cloud.google.com/go/auth/oauth2adapt v0.2.2 // indirect
cloud.google.com/go/compute/metadata v0.3.0 // indirect
cloud.google.com/go/longrunning v0.5.6 // indirect
cloud.google.com/go/longrunning v0.5.7 // indirect
github.com/PuerkitoBio/goquery v1.8.0 // indirect
github.com/andybalholm/cascadia v1.3.1 // indirect
github.com/dlclark/regexp2 v1.10.0 // indirect
Expand All @@ -39,7 +42,7 @@ require (
github.com/google/s2a-go v0.1.7 // indirect
github.com/google/uuid v1.6.0 // indirect
github.com/googleapis/enterprise-certificate-proxy v0.3.2 // indirect
github.com/googleapis/gax-go/v2 v2.12.4 // indirect
github.com/googleapis/gax-go/v2 v2.12.5 // indirect
github.com/jackc/pgpassfile v1.0.0 // indirect
github.com/jackc/pgservicefile v0.0.0-20221227161230-091c0ba34f0a // indirect
github.com/jackc/puddle/v2 v2.2.1 // indirect
Expand All @@ -50,21 +53,21 @@ require (
github.com/modern-go/reflect2 v1.0.2 // indirect
github.com/rogpeppe/go-internal v1.12.0 // indirect
go.opencensus.io v0.24.0 // indirect
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0 // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect
go.opentelemetry.io/otel v1.24.0 // indirect
go.opentelemetry.io/otel/metric v1.24.0 // indirect
go.opentelemetry.io/otel/trace v1.24.0 // indirect
golang.org/x/crypto v0.22.0 // indirect
golang.org/x/oauth2 v0.19.0 // indirect
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.51.0 // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.51.0 // indirect
go.opentelemetry.io/otel v1.26.0 // indirect
go.opentelemetry.io/otel/metric v1.26.0 // indirect
go.opentelemetry.io/otel/trace v1.26.0 // indirect
golang.org/x/crypto v0.24.0 // indirect
golang.org/x/oauth2 v0.21.0 // indirect
golang.org/x/sync v0.7.0 // indirect
golang.org/x/sys v0.19.0 // indirect
golang.org/x/text v0.14.0 // indirect
golang.org/x/sys v0.21.0 // indirect
golang.org/x/text v0.16.0 // indirect
golang.org/x/time v0.5.0 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20240415180920-8c6c420018be // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240415180920-8c6c420018be // indirect
google.golang.org/grpc v1.63.2 // indirect
google.golang.org/protobuf v1.33.0 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20240617180043-68d350f18fd4 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240617180043-68d350f18fd4 // indirect
google.golang.org/grpc v1.64.1 // indirect
google.golang.org/protobuf v1.34.2 // indirect
gopkg.in/xmlpath.v2 v2.0.0-20150820204837-860cbeca3ebc // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
)
Loading

0 comments on commit f075960

Please sign in to comment.