+4 -4

Dockerfile

reviewed

··· 4 4 ADD . /dockerbuild 5 5 WORKDIR /dockerbuild 6 6 7 7 - RUN GIT_VERSION=$(git describe --tags --long --always) && \ 7 7 + RUN GIT_VERSION=$(git describe --tags --long --always || echo "dev-local") && \ 8 8 go mod tidy && \ 9 9 - go build -o cocoon ./cmd/cocoon 9 9 + go build -ldflags "-X main.Version=$GIT_VERSION" -o cocoon ./cmd/cocoon 10 10 11 11 ### Run stage 12 12 FROM debian:bookworm-slim AS run 13 13 14 14 - RUN apt-get update && apt-get install -y dumb-init runit 14 14 + RUN apt-get update && apt-get install -y dumb-init runit ca-certificates && rm -rf /var/lib/apt/lists/* 15 15 ENTRYPOINT ["dumb-init", "--"] 16 16 17 17 WORKDIR / 18 18 RUN mkdir -p data/cocoon 19 19 COPY --from=build-env /dockerbuild/cocoon / 20 20 21 21 - CMD ["/cocoon"] 21 21 + CMD ["/cocoon", "run"] 22 22 23 23 LABEL org.opencontainers.image.source=https://github.com/haileyok/cocoon 24 24 LABEL org.opencontainers.image.description="Cocoon ATProto PDS"

+1 -1

server/handle_actor_get_preferences.go

reviewed

··· 16 16 err := json.Unmarshal(repo.Preferences, &prefs) 17 17 if err != nil || prefs["preferences"] == nil { 18 18 prefs = map[string]any{ 19 19 - "preferences": map[string]any{}, 19 19 + "preferences": []any{}, 20 20 } 21 21 } 22 22

+2 -2

server/server.go

reviewed

··· 284 284 IdleTimeout: 5 * time.Minute, 285 285 } 286 286 287 287 - gdb, err := gorm.Open(sqlite.Open("cocoon.db"), &gorm.Config{}) 287 287 + gdb, err := gorm.Open(sqlite.Open(args.DbName), &gorm.Config{}) 288 288 if err != nil { 289 289 return nil, err 290 290 } ··· 387 387 388 388 // TODO: should validate these args 389 389 if args.SmtpUser == "" || args.SmtpPass == "" || args.SmtpHost == "" || args.SmtpPort == "" || args.SmtpEmail == "" || args.SmtpName == "" { 390 390 - args.Logger.Warn("not enough smpt args were provided. mailing will not work for your server.") 390 390 + args.Logger.Warn("not enough smtp args were provided. mailing will not work for your server.") 391 391 } else { 392 392 mail := mailyak.New(args.SmtpHost+":"+args.SmtpPort, smtp.PlainAuth("", args.SmtpUser, args.SmtpPass, args.SmtpHost)) 393 393 mail.From(s.config.SmtpEmail)