Merge pull request #3 from xpunch/dev

[feat] support docker

Author: xpunch

.dockerignore

@@ -0,0 +1,2 @@
+docs
+frontend

.gitignore

@@ -14,5 +14,6 @@
 # Swagger
 docs/
 
-# frontend dist
-web/
+# config files
+config.yaml
+config.toml

Dockerfile

@@ -1,23 +1,17 @@
-FROM golang:1.17 as api-builder
+FROM golang:1.17 as builder
 
-WORKDIR /usr/local/bin
-
-RUN CGO_ENABLED=0 GOOS=linux go build -a -installsuffix cgo -o dashboard .
-
-FROM node:17 as web-builder
-
-WORKDIR /usr/local/bin
-
-RUN cd frontend && npm install && ng build --output-path web
+RUN git clone https://github.com/xpunch/go-micro-dashboard.git /usr/local/micro \
+    && cd /usr/local/micro \
+    && go install github.com/swaggo/swag/cmd/swag@latest \
+    && swag init \
+    && CGO_ENABLED=0 GOOS=linux go build -a -installsuffix cgo -o dashboard .
 
 FROM alpine:latest
 
 WORKDIR /usr/local/bin
 
-COPY --from=api-builder /usr/local/bin/dashboard .
-
-COPY --from=web-builder /usr/local/bin/web .
+COPY --from=builder /usr/local/micro/dashboard .
 
 EXPOSE 80
 
-CMD [ "/usr/local/bin/dashboard" ]
+ENTRYPOINT [ "/usr/local/bin/dashboard" ]

README.md

@@ -5,13 +5,19 @@ Go micro dashboard is designed to make it as easy as possible for users to work
 ## Features
 
 - [ ] Logo
-- [x] Dashboard
-- [x] Services list
+- [x] Web UI
+- [x] Service discovery
 - [ ] Health check
 - [ ] Configure service
-- [ ] Endpoint request
+- [x] Endpoint request
 - [ ] Broker messages
 
+## Installation
+
+```
+go install github.com/xpunch/go-micro-dashboard@latest
+```
+
 ## Development
 
 ### Server
@@ -24,25 +30,27 @@ swag init
 ```
 
 #### Config
+
 ```
-default username: admin 
+default username: admin
 default password: 123456
 ```
 
 ### Web UI
 
 [Document](https://github.com/xpunch/go-micro-dashboard/tree/main/frontend)
 
-## Docker
+#### Generate Web Files
 
 ```
-docker run .
+go install github.com/UnnoTed/fileb0x@latest
+fileb0x b0x.yaml
 ```
 
-## Docker Compose
+## Docker
 
 ```
-docker-compose up -d
+docker run -d --name "go-micro-dashboard" -p "4000:4000" xpunch/go-micro-dashboard
 ```
 
 ### Community

b0x.yaml

@@ -0,0 +1,83 @@
+# all folders and files are relative to the path
+# where fileb0x was run at!
+
+# default: main
+pkg: web
+
+# destination
+dest: "./web/"
+
+# gofmt
+# type: bool
+# default: false
+fmt: true
+
+# compress files
+# at the moment, only supports gzip
+#
+# type: object
+compression:
+  # activates the compression
+  #
+  # type: bool
+  # default: false
+  compress: false
+
+  # valid values are:
+  # -> "NoCompression"
+  # -> "BestSpeed"
+  # -> "BestCompression"
+  # -> "DefaultCompression" or ""
+  #
+  # type: string
+  # default: "DefaultCompression" # when: Compress == true && Method == ""
+  method: ""
+
+  # true = do it yourself (the file is written as gzip compressed file into the memory file system)
+  # false = decompress files at run time (while writing file into memory file system)
+  #
+  # type: bool
+  # default: false
+  keep: false
+
+# ---------------
+# -- DANGEROUS --
+# ---------------
+#
+# cleans the destination folder (only b0xfiles)
+# you should use this when using the spread function
+# type: bool
+# default: false
+clean: true
+
+# default: ab0x.go
+output: "ab0x.go"
+
+# [unexporTed] builds non-exporTed functions, variables and types...
+# type: bool
+# default: false
+unexporTed: false
+
+# [spread] means it will make a file to hold all fileb0x data
+# and each file into a separaTed .go file
+#
+# example:
+# theres 2 files in the folder assets, they're: hello.json and world.txt
+# when spread is activaTed, fileb0x will make a file:
+# b0x.go or [output]'s data, assets_hello.json.go and assets_world.txt.go
+#
+#
+# type: bool
+# default: false
+spread: true
+
+# [lcf] log changed files when spread is active
+lcf: true
+
+# type: array of objects
+custom:
+  - files:
+      - "frontend/dist"
+    base: "frontend/dist"
+    exclude:
+      - "/3rdpartylicenses.txt"

config.yaml

@@ -17,7 +17,6 @@ type ServerConfig struct {
 	Auth    AuthConfig
 	CORS    CORSConfig
 	Swagger SwaggerConfig
-	Web     WebConfig
 }
 
 type AuthConfig struct {
@@ -37,10 +36,6 @@ type SwaggerConfig struct {
 	Base string
 }
 
-type WebConfig struct {
-	Path string
-}
-
 func GetConfig() Config {
 	return *_cfg
 }

config/config.go

@@ -29,12 +29,9 @@ var _cfg *Config = &Config{
 			TokenExpiration: 24 * time.Hour,
 		},
 		Swagger: SwaggerConfig{
-			Host: "localhost:4000",
+			Host: "localhost",
 			Base: "/",
 		},
-		Web: WebConfig{
-			Path: "web",
-		},
 	},
 }
 
@@ -43,10 +40,6 @@ func Load() error {
 	var configor config.Config
 	var err error
 	switch strings.ToLower(os.Getenv("CONFIG_TYPE")) {
-	case "env":
-		configor, err = config.NewConfig(
-			config.WithSource(env.NewSource()),
-		)
 	case "toml":
 		filename := "config.toml"
 		if name := os.Getenv("CONFIG_FILE"); len(name) > 0 {
@@ -56,7 +49,7 @@ func Load() error {
 			config.WithSource(file.NewSource(file.WithPath(filename))),
 			config.WithReader(json.NewReader(reader.WithEncoder(toml.NewEncoder()))),
 		)
-	default:
+	case "yaml":
 		filename := "config.yaml"
 		if name := os.Getenv("CONFIG_FILE"); len(name) > 0 {
 			filename = name
@@ -65,6 +58,10 @@ func Load() error {
 			config.WithSource(file.NewSource(file.WithPath(filename))),
 			config.WithReader(json.NewReader(reader.WithEncoder(yaml.NewEncoder()))),
 		)
+	default:
+		configor, err = config.NewConfig(
+			config.WithSource(env.NewSource()),
+		)
 	}
 	if err != nil {
 		return errors.Wrap(err, "configor.New")

config/load.go

@@ -52,7 +52,7 @@
         "build": {
           "builder": "@angular-devkit/build-angular:browser",
           "options": {
-            "outputPath": "../web",
+            "outputPath": "dist",
             "index": "src/index.html",
             "main": "src/main.ts",
             "polyfills": "src/polyfills.ts",

frontend/angular.json

@@ -16,7 +16,7 @@
     <nz-list-item *ngFor="let service of services" nzNoFlex>
         <a (click)="gotoServiceDetail(service.name, undefined)">{{ service.name }}</a>
         <span *ngFor="let version of service.versions" style="margin-left:8px;">
-            <nz-tag [nzColor]="'green'"><a (click)="gotoServiceDetail(service.name, version)">{{ version }}</a></nz-tag>
+            <nz-tag *ngIf="version" [nzColor]="'green'"><a (click)="gotoServiceDetail(service.name, version)">{{ version }}</a></nz-tag>
         </span>
     </nz-list-item>
     <nz-list-empty *ngIf="!services||!services.length"></nz-list-empty>