feat: add dockerfile, rename frontend to ui

stijlmassi · Jan 4, 2023 · a045219 · a045219
1 parent d50c7d2
commit a045219
Show file tree

Hide file tree

Showing 21 changed files with 29 additions and 5 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -0,0 +1,24 @@
+# Build FrontEnd
+FROM node:16 as fe-builder
+RUN apt update -y && apt install -y golang && npm install -g vite
+RUN mkdir /build
+ADD ./ui /build/ui
+WORKDIR /build/ui
+RUN yarn && yarn build
+
+# Build BackEnd
+FROM golang:1.19-alpine3.16 as builder
+RUN apk add --no-cache make
+RUN mkdir /build
+ADD ./ /build/
+RUN rm -rf /build/ui
+COPY --from=fe-builder /build/ui /build/ui
+WORKDIR /build
+RUN make be
+
+# Package Staage
+FROM alpine:3.11.3
+COPY --from=builder /build/dist/go-svelte /app/go-svelte
+COPY --from=builder /build/config.yml /app/config.yml
+CMD [ "/app/go-svelte", "serve", "-c", "/app/config.yml" ]
+
diff --git a/Makefile b/Makefile
@@ -14,7 +14,7 @@ tidy:
 
 fe:
 	@echo "Building frontend..."
-	@cd frontend && vite build
+	@cd ui && yarn && yarn build
 
 be:
 	@echo "Building backend..."

diff --git a/cli.go b/cli.go
@@ -13,9 +13,9 @@ import (
 	"gopkg.in/yaml.v2"
 
 	"github.com/saas-templates/go-svelte/api"
-	"github.com/saas-templates/go-svelte/frontend"
 	"github.com/saas-templates/go-svelte/pkg/httputils"
 	"github.com/saas-templates/go-svelte/pkg/log"
+	"github.com/saas-templates/go-svelte/ui"
 )
 
 func newCLI(ctx context.Context) *cobra.Command {
@@ -44,7 +44,7 @@ func cmdServe() *cobra.Command {
 			cfg := loadConf(cmd)
 
 			router := chi.NewRouter()
-			router.Mount("/", http.FileServer(http.FS(frontend.DistFS)))
+			router.Mount("/", http.FileServer(http.FS(ui.DistFS)))
 			router.Mount("/api", api.Router(cfg.API))
 
 			log.Infof(cmd.Context(), "listening at '%s'...", cfg.Addr)

diff --git a/frontend/app/App.svelte → ui/app/App.svelte b/frontend/app/App.svelte → ui/app/App.svelte
diff --git a/frontend/app/index.html → ui/app/index.html b/frontend/app/index.html → ui/app/index.html
diff --git a/frontend/app/main.ts → ui/app/main.ts b/frontend/app/main.ts → ui/app/main.ts
diff --git a/frontend/app/public/vite.svg → ui/app/public/vite.svg b/frontend/app/public/vite.svg → ui/app/public/vite.svg
diff --git a/frontend/app/routes/Home.svelte → ui/app/routes/Home.svelte b/frontend/app/routes/Home.svelte → ui/app/routes/Home.svelte
diff --git a/frontend/app/routes/NotFound.svelte → ui/app/routes/NotFound.svelte b/frontend/app/routes/NotFound.svelte → ui/app/routes/NotFound.svelte
diff --git a/frontend/app/vite-env.d.ts → ui/app/vite-env.d.ts b/frontend/app/vite-env.d.ts → ui/app/vite-env.d.ts
diff --git a/frontend/embed.go → ui/embed.go b/frontend/embed.go → ui/embed.go
@@ -1,4 +1,4 @@
-package frontend
+package ui
 
 import (
 	"embed"

diff --git a/frontend/globals.css → ui/globals.css b/frontend/globals.css → ui/globals.css
diff --git a/frontend/index.html → ui/index.html b/frontend/index.html → ui/index.html
@@ -4,7 +4,7 @@
     <meta charset="UTF-8" />
     <meta http-equiv="X-UA-Compatible" content="IE=edge" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>AIGizmos</title>
+    <title>Go-Svlete</title>
     <link rel="stylesheet" href="./globals.css" />
   </head>
   <body>

diff --git a/frontend/package.json → ui/package.json b/frontend/package.json → ui/package.json
diff --git a/frontend/postcss.config.cjs → ui/postcss.config.cjs b/frontend/postcss.config.cjs → ui/postcss.config.cjs
diff --git a/frontend/svelte.config.js → ui/svelte.config.js b/frontend/svelte.config.js → ui/svelte.config.js
diff --git a/frontend/tailwind.config.cjs → ui/tailwind.config.cjs b/frontend/tailwind.config.cjs → ui/tailwind.config.cjs
diff --git a/frontend/tsconfig.json → ui/tsconfig.json b/frontend/tsconfig.json → ui/tsconfig.json
diff --git a/frontend/tsconfig.node.json → ui/tsconfig.node.json b/frontend/tsconfig.node.json → ui/tsconfig.node.json
diff --git a/frontend/vite.config.ts → ui/vite.config.ts b/frontend/vite.config.ts → ui/vite.config.ts
diff --git a/frontend/yarn.lock → ui/yarn.lock b/frontend/yarn.lock → ui/yarn.lock