ralsina
/
nano-run
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

build: packaging ui

This commit is contained in:
Alexander Baryshnikov 2020-09-28 21:55:31 +08:00
parent dac1910200
commit 48094464eb
4 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
.goreleaser.yml
View File

@ -40,6 +40,12 @@ nfpms:
"bundle/debian/server.yaml": "/etc/nano-run/server.yaml" "bundle/debian/server.yaml": "/etc/nano-run/server.yaml"
files: files:
"bundle/debian/nano-run.service": "/etc/systemd/system/nano-run.service" "bundle/debian/nano-run.service": "/etc/systemd/system/nano-run.service"
"templates/**": "/var/nano-run/ui"
archives:
- files:
- "templates/**"
wrap_in_directory: true
uploads: uploads:
- name: bintray - name: bintray
method: PUT method: PUT
@ -55,6 +61,7 @@ dockers:
dockerfile: Dockerfile dockerfile: Dockerfile
extra_files: extra_files:
- bundle/docker/server.yaml - bundle/docker/server.yaml
- templates
build_flag_templates: build_flag_templates:
- "--label=org.opencontainers.image.created={{.Date}}" - "--label=org.opencontainers.image.created={{.Date}}"
- "--label=org.opencontainers.image.title={{.ProjectName}}" - "--label=org.opencontainers.image.title={{.ProjectName}}"

1
bundle/debian/server.yaml
View File

@ -1,5 +1,6 @@
# Location to store tasks, blobs and queues # Location to store tasks, blobs and queues
working_directory: /var/nano-run working_directory: /var/nano-run
ui_directory: /var/nano-run/ui
config_directory: /etc/nano-run/conf.d config_directory: /etc/nano-run/conf.d
bind: 127.0.0.1:8989 bind: 127.0.0.1:8989
graceful_shutdown: 5s graceful_shutdown: 5s

3
cmd/nano-run/run_cmd.go
View File

@ -10,6 +10,7 @@ import (
"time" "time"
"nano-run/server" "nano-run/server"
"nano-run/server/runner"
) )
type runCmd struct { type runCmd struct {
@ -31,7 +32,7 @@ func (cfg *runCmd) Execute([]string) error {
return err return err
} }
defer os.RemoveAll(tmpDir) defer os.RemoveAll(tmpDir)
srv := server.DefaultConfig() srv := runner.DefaultConfig()
srv.Bind = cfg.Bind srv.Bind = cfg.Bind
srv.WorkingDirectory = cfg.Directory srv.WorkingDirectory = cfg.Directory
srv.ConfigDirectory = tmpDir srv.ConfigDirectory = tmpDir

5
cmd/nano-run/server_cmd.go
View File

@ -6,6 +6,7 @@ import (
"path/filepath" "path/filepath"
"nano-run/server" "nano-run/server"
"nano-run/server/runner"
) )
type serverCmd struct { type serverCmd struct {
@ -24,7 +25,7 @@ func (cmd *serverInitCmd) Execute([]string) error {
if err != nil { if err != nil {
return err return err
} }
cfg := server.DefaultConfig() cfg := runner.DefaultConfig()
err = cfg.SaveFile(filepath.Join(cmd.Directory, cmd.ConfigFile)) err = cfg.SaveFile(filepath.Join(cmd.Directory, cmd.ConfigFile))
if err != nil { if err != nil {
return err return err
@ -53,7 +54,7 @@ type serverRunCmd struct {
} }
func (cmd *serverRunCmd) Execute([]string) error { func (cmd *serverRunCmd) Execute([]string) error {
cfg := server.DefaultConfig() cfg := runner.DefaultConfig()
err := cfg.LoadFile(cmd.Config) err := cfg.LoadFile(cmd.Config)
if os.IsNotExist(err) && !cmd.Fail { if os.IsNotExist(err) && !cmd.Fail {
log.Println("no config file found - using transient default configuration") log.Println("no config file found - using transient default configuration")