feat: succesfully embed shioriko this time

2025-03-10 05:57:22 +00:00 · 2025-02-23 18:50:12 +00:00 · 2025-02-23 18:50:12 +00:00 · 51453a8e93
commit 51453a8e93
parent 59f796331a
53 changed files with 34 additions and 62 deletions
--- a/23
+++ b/23
@ -1,23 +1,20 @@
-FROM golang:1.23-alpine AS build
-
-WORKDIR /go/src/shioriko
-COPY . .
-
-RUN go get -d -v ./...
-RUN CGO_ENABLED=0 GOOS=linux go build -o /shioriko -ldflags '-extldflags "-static"' -tags timetzdata
-RUN mkdir -p /web && cp -r web/static /web
-
+# Web client
 FROM node:20-alpine AS node_build
 WORKDIR /src
 COPY . .
-WORKDIR /src/web/app
+WORKDIR /src/pkg/web
 RUN npm ci && npm run build

-FROM scratch AS runtime
+# Go application
+FROM golang:1.23-alpine AS build
+WORKDIR /go/src/shioriko
+COPY . .
+COPY --from=node_build /src/pkg/web/build/ /go/src/shioriko/pkg/web/build/
+RUN go get -d -v ./...
+RUN CGO_ENABLED=0 GOOS=linux go build -o /shioriko -ldflags '-extldflags "-static"' -tags timetzdata

+FROM scratch AS runtime
 WORKDIR /app
 COPY --from=build /shioriko /app/
 COPY --from=build /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/
-COPY --from=node_build /src/web/static/ /app/web/static/
-
 ENTRYPOINT ["/app/shioriko"]
--- a/pkg/app/app.go
+++ b/pkg/app/app.go
@ -1,35 +1,17 @@
 package app

 import (
-	"embed"
+	"io/fs"
 	"net/http"
 	"os"

 	"github.com/Damillora/Shioriko/pkg/config"
 	"github.com/Damillora/Shioriko/pkg/database"
+	"github.com/Damillora/Shioriko/pkg/web"
 	"github.com/gin-contrib/cors"
-	"github.com/gin-contrib/static"
 	"github.com/gin-gonic/gin"
 )

-type embedFileSystem struct {
-	http.FileSystem
-}
-
-func (e embedFileSystem) Exists(prefix string, path string) bool {
-	_, err := e.Open(path)
-	if err != nil {
-		return false
-	}
-	return true
-}
-
-func EmbedFolder(fsEmbed embed.FS) static.ServeFileSystem {
-	return embedFileSystem{
-		FileSystem: http.FS(fsEmbed),
-	}
-}
-
 func Initialize() {
 	config.InitializeConfig()

@ -49,10 +31,14 @@ func Initialize() {
 func Start() {
 	g := gin.Default()

-	g.StaticFile("/", "./web/static/index.html")
-	g.Static("/_app", "./web/static/_app")
+	webFS := web.WebAssets()
+	webAssets, _ := fs.Sub(webFS, "_app")
+
+	g.StaticFileFS("/", "./app.html", http.FS(webFS))
+	// g.StaticFile("/", "./pkg/web/build/index.html")
+	g.StaticFS("/_app", http.FS(webAssets))
 	g.Static("/data", config.CurrentConfig.DataDirectory)
-	
+
 	g.Use(cors.Default())

 	InitializeRoutes(g)
--- a/pkg/web/.eslintignore
+++ b/pkg/web/.eslintignore
--- a/pkg/web/.eslintrc.cjs
+++ b/pkg/web/.eslintrc.cjs
--- a/pkg/web/.gitignore
+++ b/pkg/web/.gitignore
--- a/pkg/web/.npmrc
+++ b/pkg/web/.npmrc
--- a/pkg/web/README.md
+++ b/pkg/web/README.md
--- a/pkg/web/embed.go
+++ b/pkg/web/embed.go
@ -0,0 +1,14 @@
+package web
+
+import (
+	"embed"
+	"io/fs"
+)
+
+//go:embed build/*
+var webFS embed.FS
+
+func WebAssets() fs.FS {
+	build, _ := fs.Sub(webFS, "build")
+	return build
+}
--- a/pkg/web/package-lock.json
+++ b/pkg/web/package-lock.json
--- a/pkg/web/package.json
+++ b/pkg/web/package.json
--- a/pkg/web/src/app.d.ts
+++ b/pkg/web/src/app.d.ts
--- a/pkg/web/src/app.html
+++ b/pkg/web/src/app.html
--- a/pkg/web/src/app.scss
+++ b/pkg/web/src/app.scss
--- a/pkg/web/src/lib/api.ts
+++ b/pkg/web/src/lib/api.ts
--- a/pkg/web/src/lib/components/checks/AuthCheck.svelte
+++ b/pkg/web/src/lib/components/checks/AuthCheck.svelte
--- a/pkg/web/src/lib/components/checks/AuthRequired.svelte
+++ b/pkg/web/src/lib/components/checks/AuthRequired.svelte
--- a/pkg/web/src/lib/components/panels/EditPostPanel.svelte
+++ b/pkg/web/src/lib/components/panels/EditPostPanel.svelte
--- a/pkg/web/src/lib/components/panels/EditTagNotesPanel.svelte
+++ b/pkg/web/src/lib/components/panels/EditTagNotesPanel.svelte
--- a/pkg/web/src/lib/components/panels/EditTagPanel.svelte
+++ b/pkg/web/src/lib/components/panels/EditTagPanel.svelte
--- a/pkg/web/src/lib/components/panels/UserActionsPanel.svelte
+++ b/pkg/web/src/lib/components/panels/UserActionsPanel.svelte
--- a/pkg/web/src/lib/components/panels/ViewPostPanel.svelte
+++ b/pkg/web/src/lib/components/panels/ViewPostPanel.svelte
--- a/pkg/web/src/lib/components/panels/ViewTagNotesPanel.svelte
+++ b/pkg/web/src/lib/components/panels/ViewTagNotesPanel.svelte
--- a/pkg/web/src/lib/components/panels/ViewTagPanel.svelte
+++ b/pkg/web/src/lib/components/panels/ViewTagPanel.svelte
--- a/pkg/web/src/lib/components/ui/Navbar.svelte
+++ b/pkg/web/src/lib/components/ui/Navbar.svelte
--- a/pkg/web/src/lib/components/ui/PostGallery.svelte
+++ b/pkg/web/src/lib/components/ui/PostGallery.svelte
--- a/pkg/web/src/lib/components/ui/ShiorikoImage.svelte
+++ b/pkg/web/src/lib/components/ui/ShiorikoImage.svelte
--- a/pkg/web/src/lib/components/ui/TagLinkNumbered.svelte
+++ b/pkg/web/src/lib/components/ui/TagLinkNumbered.svelte
--- a/pkg/web/src/lib/components/ui/TagTypeIndicator.svelte
+++ b/pkg/web/src/lib/components/ui/TagTypeIndicator.svelte
--- a/pkg/web/src/lib/index.ts
+++ b/pkg/web/src/lib/index.ts
--- a/pkg/web/src/lib/login-check.js
+++ b/pkg/web/src/lib/login-check.js
--- a/pkg/web/src/lib/simple-pagination.js
+++ b/pkg/web/src/lib/simple-pagination.js
--- a/pkg/web/src/lib/stores.ts
+++ b/pkg/web/src/lib/stores.ts
--- a/pkg/web/src/routes/+layout.svelte
+++ b/pkg/web/src/routes/+layout.svelte
--- a/pkg/web/src/routes/+page.svelte
+++ b/pkg/web/src/routes/+page.svelte
--- a/pkg/web/src/routes/auth/+layout.svelte
+++ b/pkg/web/src/routes/auth/+layout.svelte
--- a/pkg/web/src/routes/auth/login/+page.svelte
+++ b/pkg/web/src/routes/auth/login/+page.svelte
--- a/pkg/web/src/routes/auth/logout/+page.svelte
+++ b/pkg/web/src/routes/auth/logout/+page.svelte
--- a/pkg/web/src/routes/auth/register/+page.svelte
+++ b/pkg/web/src/routes/auth/register/+page.svelte
--- a/pkg/web/src/routes/post/[id]/+page.svelte
+++ b/pkg/web/src/routes/post/[id]/+page.svelte
--- a/pkg/web/src/routes/posts/+page.svelte
+++ b/pkg/web/src/routes/posts/+page.svelte
--- a/pkg/web/src/routes/tags/+page.svelte
+++ b/pkg/web/src/routes/tags/+page.svelte
--- a/pkg/web/src/routes/tags/[tag]/+page.svelte
+++ b/pkg/web/src/routes/tags/[tag]/+page.svelte
--- a/pkg/web/src/routes/upload/+page.svelte
+++ b/pkg/web/src/routes/upload/+page.svelte
--- a/pkg/web/src/routes/user/password/+page.svelte
+++ b/pkg/web/src/routes/user/password/+page.svelte
--- a/pkg/web/src/routes/user/profile/+page.svelte
+++ b/pkg/web/src/routes/user/profile/+page.svelte
--- a/pkg/web/static/.gitignore
+++ b/pkg/web/static/.gitignore
--- a/pkg/web/svelte.config.js
+++ b/pkg/web/svelte.config.js
@ -12,8 +12,7 @@ const config = {
    // If your environment is not supported or you settled on a specific environment, switch out the adapter.
    // See https://kit.svelte.dev/docs/adapters for more information about adapters.
    adapter: adapter({
-      fallback: 'index.html', // may differ from host to host,
-      pages: '../static',
+      fallback: 'app.html', // may differ from host to host
    })
  },
 };
--- a/pkg/web/tsconfig.json
+++ b/pkg/web/tsconfig.json
--- a/pkg/web/vite.config.ts
+++ b/pkg/web/vite.config.ts
--- a/web/static/.gitignore
+++ b/web/static/.gitignore
@ -1,2 +0,0 @@
-*
-!.gitignore
--- a/web/template/layout/footer.html
+++ b/web/template/layout/footer.html
@ -1,4 +0,0 @@
-
-  </body>
-  </html>
-  
--- a/web/template/layout/header.html
+++ b/web/template/layout/header.html
@ -1,15 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <!--Use the title variable to set the title of the page-->
-    <title>{{ .title }}</title>
-    <meta name="viewport" content="width=device-width, initial-scale=1" />
-    <meta charset="UTF-8" />
-    <script defer src="/static/bundle.js"></script>
-    <link rel="stylesheet" href="/static/bundle.css">
-    <script>
-      window.BASE_URL = {{ .base_url }}
-    </script>
-  </head>
-  <body>
-      
--- a/web/template/pages/index.html
+++ b/web/template/pages/index.html
@ -1,3 +0,0 @@
-{{ template "header.html" .}}
-
-{{ template "footer.html" }}