pico

feat(storage): base storage fn rss
created pr with 70.1 on 2025-06-08T15:26:48Z · by c8ef7d19
cmds
checkout latest patchset: 
ssh pr.pico.sh print 70 | git am -3
checkout any patchset in a patch request: 
ssh pr.pico.sh print 70.[rev] | git am -3
add changes to patch request: 
git format-patch main --stdout | ssh pr.pico.sh pr add 70

Patchset 70.1 on 2025-06-08T15:26:48Z · commit e63282c

feat(storage): base storage fn
Eric Bower 2025-06-08T12:36:50Z
 → feat(prose): use storage base for prose
Eric Bower 2025-06-08T13:08:11Z
 refactor(prose): use fs adapter for images
Eric Bower 2025-06-08T14:58:02Z
 refactor: proxy headers for images
Eric Bower 2025-06-08T15:26:36Z
feat(prose): use storage base for prose
Eric Bower 2025-06-08T13:08:11Z
Semantic diff summary
0 added, 3 modified, 0 signature changed, 0 removed across 3 analyzed files (1 file skipped: unsupported file type)
pkg/apps/prose/api.go
pkg/apps/prose/ssh.go
pkg/shared/config.go
+2 -2 Dockerfile #
......@@ -54,7 +54,7 @@ ARG APP=prose
5454
5555 COPY --from=builder-web /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/
5656 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
5858 COPY --from=builder-web /app/pkg/apps/${APP}/public ./${APP}/public
5959
6060 ENTRYPOINT ["/app/web"]
......@@ -69,7 +69,7 @@ ARG APP=prose
6969 COPY --from=builder-ssh /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/
7070 COPY --from=builder-ssh /go/bin/${APP}-ssh ./ssh
7171 # 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
7373
7474
7575 ENTRYPOINT ["/app/ssh"]
+4 -9 pkg/apps/prose/api.go #
......@@ -931,16 +931,11 @@ func StartApiServer() {
931931 }()
932932 logger := cfg.Logger
933933
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)
942936 if err != nil {
943- logger.Error(err.Error())
937+ logger.Error("loading storage", "err", err)
938+ return
944939 }
945940
946941 staticRoutes := createStaticRoutes()
+3 -9 pkg/apps/prose/ssh.go #
......@@ -44,16 +44,10 @@ func StartSshServer() {
4444 Db: dbh,
4545 }
4646
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)
5549 if err != nil {
56- logger.Error("storage", "err", err.Error())
50+ logger.Error("loading storage", "err", err)
5751 return
5852 }
5953
+1 -1 pkg/shared/config.go #
......@@ -122,7 +122,7 @@ func (c *ConfigSite) ReadURL() string {
122122 }
123123
124124 func (c *ConfigSite) StaticPath(fname string) string {
125- return path.Join(c.Space, fname)
125+ return path.Join("pkg", "apps", c.Space, fname)
126126 }
127127
128128 func (c *ConfigSite) BlogURL(username string) string {
Back to top