pico
created pr with
69.1
added 69.2
1: 827f272 = 1: 827f272 feat(storage): base storage fn
2: e63282c = 2: e63282c feat(prose): use storage base for prose
3: 2a52510 = 3: 2a52510 refactor(prose): use fs adapter for images
-: ------- > 4: 6ddc654 refactor: proxy headers for images
cmds
checkout latest patchset:
ssh pr.pico.sh print 69 | git am -3checkout any patchset in a patch request:
ssh pr.pico.sh print 69.[rev] | git am -3add changes to patch request:
git format-patch main --stdout | ssh pr.pico.sh pr add 69
Patchset
69.2
feat(prose): use storage base for prose
Eric Bower
2025-06-08T13:08:11ZSemantic diff summary
0 added,
3 modified,
0 signature changed,
0 removed
across 3 analyzed files
(1 file skipped: unsupported file type)
+2
-2
Dockerfile
#
| ... | ... | @@ -54,7 +54,7 @@ ARG APP=prose | |
| 54 | 54 | ||
| 55 | 55 | COPY --from=builder-web /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ | |
| 56 | 56 | COPY --from=builder-web /go/bin/${APP}-web ./web | |
| 57 | - | COPY --from=builder-web /app/pkg/apps/${APP}/html ./${APP}/html | |
| 57 | + | COPY --from=builder-web /app/pkg/apps/${APP}/html ./pkg/apps/${APP}/html | |
| 58 | 58 | COPY --from=builder-web /app/pkg/apps/${APP}/public ./${APP}/public | |
| 59 | 59 | ||
| 60 | 60 | ENTRYPOINT ["/app/web"] |
| ... | ... | @@ -69,7 +69,7 @@ ARG APP=prose | |
| 69 | 69 | COPY --from=builder-ssh /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ | |
| 70 | 70 | COPY --from=builder-ssh /go/bin/${APP}-ssh ./ssh | |
| 71 | 71 | # some services require the html folder | |
| 72 | - | COPY --from=builder-ssh /app/pkg/apps/${APP}/html ./${APP}/html | |
| 72 | + | COPY --from=builder-ssh /app/pkg/apps/${APP}/html ./pkg/apps/${APP}/html | |
| 73 | 73 | ||
| 74 | 74 | ||
| 75 | 75 | ENTRYPOINT ["/app/ssh"] |
+4
-9
pkg/apps/prose/api.go
#
| ... | ... | @@ -931,16 +931,11 @@ func StartApiServer() { | |
| 931 | 931 | }() | |
| 932 | 932 | logger := cfg.Logger | |
| 933 | 933 | ||
| 934 | - | var st storage.StorageServe | |
| 935 | - | var err error | |
| 936 | - | if cfg.MinioURL == "" { | |
| 937 | - | st, err = storage.NewStorageFS(cfg.Logger, cfg.StorageDir) | |
| 938 | - | } else { | |
| 939 | - | st, err = storage.NewStorageMinio(cfg.Logger, cfg.MinioURL, cfg.MinioUser, cfg.MinioPass) | |
| 940 | - | } | |
| 941 | - | ||
| 934 | + | adapter := storage.GetStorageTypeFromEnv() | |
| 935 | + | st, err := storage.NewStorage(cfg.Logger, adapter) | |
| 942 | 936 | if err != nil { | |
| 943 | - | logger.Error(err.Error()) | |
| 937 | + | logger.Error("loading storage", "err", err) | |
| 938 | + | return | |
| 944 | 939 | } | |
| 945 | 940 | ||
| 946 | 941 | staticRoutes := createStaticRoutes() |
+3
-9
pkg/apps/prose/ssh.go
#
| ... | ... | @@ -44,16 +44,10 @@ func StartSshServer() { | |
| 44 | 44 | Db: dbh, | |
| 45 | 45 | } | |
| 46 | 46 | ||
| 47 | - | var st storage.StorageServe | |
| 48 | - | var err error | |
| 49 | - | if cfg.MinioURL == "" { | |
| 50 | - | st, err = storage.NewStorageFS(cfg.Logger, cfg.StorageDir) | |
| 51 | - | } else { | |
| 52 | - | st, err = storage.NewStorageMinio(cfg.Logger, cfg.MinioURL, cfg.MinioUser, cfg.MinioPass) | |
| 53 | - | } | |
| 54 | - | ||
| 47 | + | adapter := storage.GetStorageTypeFromEnv() | |
| 48 | + | st, err := storage.NewStorage(cfg.Logger, adapter) | |
| 55 | 49 | if err != nil { | |
| 56 | - | logger.Error("storage", "err", err.Error()) | |
| 50 | + | logger.Error("loading storage", "err", err) | |
| 57 | 51 | return | |
| 58 | 52 | } | |
| 59 | 53 |