torjus/gpaste
1
0
Fork 0
Code Issues 1 Pull Requests Releases 16 Activity

Fix Dockerfile
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
Details

Browse Source
This commit is contained in:
Torjus Håkestad 2022-01-21 18:03:49 +01:00
parent db41f565ca
commit 6822cd6bfe
2 changed files with 22 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Dockerfile
View File

@ -10,4 +10,5 @@ RUN go build -o gpaste-server ./cmd/server/server.go
FROM alpine:latest
COPY --from=builder /src/gpaste /bin/gpaste
COPY --from=builder /src/gpaste-server /bin/gpaste-server
EXPOSE 8080
CMD ["/bin/gpaste-server"]

24
cmd/server/actions/actions.go
View File

@ -2,6 +2,7 @@ package actions
import (
"context"
"io"
"net/http"
"os"
"os/signal"
@ -21,14 +22,27 @@ func ActionServe(c *cli.Context) error {
configPath = c.String("config")
}
f, err := os.Open(configPath)
var cfg *gpaste.ServerConfig
var r io.ReadCloser
r, err := os.Open(configPath)
if err != nil {
cfg = &gpaste.ServerConfig{
LogLevel: "INFO",
URL: "localhost:8080",
ListenAddr: ":8080",
SigningSecret: "TODO: CHANGE THIS LOL",
Store: &gpaste.ServerStoreConfig{
Type: "memory",
},
}
} else {
defer r.Close()
cfg, err = gpaste.ServerConfigFromReader(r)
if err != nil {
if err != nil {
return cli.Exit(err, 1)
}
defer f.Close()
cfg, err := gpaste.ServerConfigFromReader(f)
if err != nil {
return cli.Exit(err, 1)
}
}
// Setup loggers
rootLogger := getRootLogger(cfg.LogLevel)