willdot.net
forked from
hailey.at/cocoon
An atproto PDS written in Go
various fixes (#29)
authored by
Jonas Lépine
and committed by
GitHub
758a6868
2fdf07f8
+4
-4
Dockerfile
+4
-4
Dockerfile
···
4
ADD . /dockerbuild
5
WORKDIR /dockerbuild
6
7
-
RUN GIT_VERSION=$(git describe --tags --long --always) && \
8
go mod tidy && \
9
-
go build -o cocoon ./cmd/cocoon
10
11
### Run stage
12
FROM debian:bookworm-slim AS run
13
14
-
RUN apt-get update && apt-get install -y dumb-init runit
15
ENTRYPOINT ["dumb-init", "--"]
16
17
WORKDIR /
18
RUN mkdir -p data/cocoon
19
COPY --from=build-env /dockerbuild/cocoon /
20
21
-
CMD ["/cocoon"]
22
23
LABEL org.opencontainers.image.source=https://github.com/haileyok/cocoon
24
LABEL org.opencontainers.image.description="Cocoon ATProto PDS"
···
4
ADD . /dockerbuild
5
WORKDIR /dockerbuild
6
7
+
RUN GIT_VERSION=$(git describe --tags --long --always || echo "dev-local") && \
8
go mod tidy && \
9
+
go build -ldflags "-X main.Version=$GIT_VERSION" -o cocoon ./cmd/cocoon
10
11
### Run stage
12
FROM debian:bookworm-slim AS run
13
14
+
RUN apt-get update && apt-get install -y dumb-init runit ca-certificates && rm -rf /var/lib/apt/lists/*
15
ENTRYPOINT ["dumb-init", "--"]
16
17
WORKDIR /
18
RUN mkdir -p data/cocoon
19
COPY --from=build-env /dockerbuild/cocoon /
20
21
+
CMD ["/cocoon", "run"]
22
23
LABEL org.opencontainers.image.source=https://github.com/haileyok/cocoon
24
LABEL org.opencontainers.image.description="Cocoon ATProto PDS"
+1
-1
server/handle_actor_get_preferences.go
+1
-1
server/handle_actor_get_preferences.go
+2
-2
server/server.go
+2
-2
server/server.go
···
284
IdleTimeout: 5 * time.Minute,
285
}
286
287
-
gdb, err := gorm.Open(sqlite.Open("cocoon.db"), &gorm.Config{})
288
if err != nil {
289
return nil, err
290
}
···
387
388
// TODO: should validate these args
389
if args.SmtpUser == "" || args.SmtpPass == "" || args.SmtpHost == "" || args.SmtpPort == "" || args.SmtpEmail == "" || args.SmtpName == "" {
390
-
args.Logger.Warn("not enough smpt args were provided. mailing will not work for your server.")
391
} else {
392
mail := mailyak.New(args.SmtpHost+":"+args.SmtpPort, smtp.PlainAuth("", args.SmtpUser, args.SmtpPass, args.SmtpHost))
393
mail.From(s.config.SmtpEmail)
···
284
IdleTimeout: 5 * time.Minute,
285
}
286
287
+
gdb, err := gorm.Open(sqlite.Open(args.DbName), &gorm.Config{})
288
if err != nil {
289
return nil, err
290
}
···
387
388
// TODO: should validate these args
389
if args.SmtpUser == "" || args.SmtpPass == "" || args.SmtpHost == "" || args.SmtpPort == "" || args.SmtpEmail == "" || args.SmtpName == "" {
390
+
args.Logger.Warn("not enough smtp args were provided. mailing will not work for your server.")
391
} else {
392
mail := mailyak.New(args.SmtpHost+":"+args.SmtpPort, smtp.PlainAuth("", args.SmtpUser, args.SmtpPass, args.SmtpHost))
393
mail.From(s.config.SmtpEmail)