mirror of
https://github.com/writefreely/writefreely
synced 2024-11-27 19:10:17 +00:00
Update config/setup.go for docker environment
This commit is contained in:
parent
24e94302d9
commit
2a668d18d3
1 changed files with 16 additions and 2 deletions
|
@ -12,12 +12,14 @@ package config
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"fmt"
|
"fmt"
|
||||||
|
"os"
|
||||||
|
"strconv"
|
||||||
|
"strings"
|
||||||
|
|
||||||
"github.com/fatih/color"
|
"github.com/fatih/color"
|
||||||
"github.com/manifoldco/promptui"
|
"github.com/manifoldco/promptui"
|
||||||
"github.com/mitchellh/go-wordwrap"
|
"github.com/mitchellh/go-wordwrap"
|
||||||
"github.com/writeas/web-core/auth"
|
"github.com/writeas/web-core/auth"
|
||||||
"strconv"
|
|
||||||
"strings"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
type SetupData struct {
|
type SetupData struct {
|
||||||
|
@ -80,6 +82,8 @@ func Configure(fname string, configSections string) (*SetupData, error) {
|
||||||
isDevEnv := envType == "Development"
|
isDevEnv := envType == "Development"
|
||||||
isStandalone := envType == "Production, standalone"
|
isStandalone := envType == "Production, standalone"
|
||||||
|
|
||||||
|
_, isDocker := os.LookupEnv("WRITEFREELY_DOCKER")
|
||||||
|
|
||||||
data.Config.Server.Dev = isDevEnv
|
data.Config.Server.Dev = isDevEnv
|
||||||
|
|
||||||
if isDevEnv || !isStandalone {
|
if isDevEnv || !isStandalone {
|
||||||
|
@ -150,6 +154,16 @@ func Configure(fname string, configSections string) (*SetupData, error) {
|
||||||
data.Config.Server.TLSKeyPath = ""
|
data.Config.Server.TLSKeyPath = ""
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// If running in docker:
|
||||||
|
// 1. always bind to 0.0.0.0 instead of localhost
|
||||||
|
// 2. set paths of static files in UNIX manners
|
||||||
|
if !isDevEnv && isDocker {
|
||||||
|
data.Config.Server.TemplatesParentDir = "/usr/share/writefreely"
|
||||||
|
data.Config.Server.StaticParentDir = "/usr/share/writefreely"
|
||||||
|
data.Config.Server.PagesParentDir = "/usr/share/writefreely"
|
||||||
|
data.Config.Server.Bind = "0.0.0.0"
|
||||||
|
}
|
||||||
|
|
||||||
fmt.Println()
|
fmt.Println()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue