taigrr/godns
1
0
Fork 0
mirror of https://github.com/taigrr/godns synced 2025-01-18 04:03:25 -08:00
Code Issues Projects Releases Wiki Activity

refactor run with docker logic

Browse Source
This commit is contained in:
Timothy 2017-09-15 16:06:55 +08:00
parent ef3faafca7
commit c302352cc9
2 changed files with 7 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Dockerfile
View File

@ -1,4 +1,4 @@
FROM alpine:latest FROM timothyye/alpine:3.6-glibc
MAINTAINER Timothy MAINTAINER Timothy
RUN apk add --update ca-certificates RUN apk add --update ca-certificates
RUN mkdir -p /usr/local/godns RUN mkdir -p /usr/local/godns
@ -6,4 +6,4 @@ COPY godns /usr/local/godns
RUN chmod +x /usr/local/godns/godns RUN chmod +x /usr/local/godns/godns
RUN rm -rf /var/cache/apk/* RUN rm -rf /var/cache/apk/*
WORKDIR /usr/local/godns WORKDIR /usr/local/godns
ENTRYPOINT ["./godns", "-d"] ENTRYPOINT ["./godns", "-c", "/usr/local/godns/config.json"]

20
godns.go
View File

@ -20,7 +20,6 @@ const (
var ( var (
configuration Settings configuration Settings
optConf = flag.String("c", "./config.json", "Specify a config file") optConf = flag.String("c", "./config.json", "Specify a config file")
optDocker = flag.Bool("d", false, "Run it as docker mode")
optHelp = flag.Bool("h", false, "Show help") optHelp = flag.Bool("h", false, "Show help")
panicCount = 0 panicCount = 0
) )
@ -32,31 +31,12 @@ func main() {
return return
} }
if *optDocker {
// Load settings from ENV
configuration = Settings{
Email: os.Getenv("EMAIL"),
Password: os.Getenv("PASSWORD"),
LoginToken: os.Getenv("TOKEN"),
IPUrl: "http://members.3322.org/dyndns/getip",
LogPath: "./godns.log",
LogSize: 16,
LogNum: 3,
}
if err := LoadDomains(os.Getenv("DOMAINS"), &configuration.Domains); err != nil {
fmt.Println(err.Error())
log.Println(err.Error())
os.Exit(1)
}
} else {
//Load settings from configurations file //Load settings from configurations file
if err := LoadSettings(*optConf, &configuration); err != nil { if err := LoadSettings(*optConf, &configuration); err != nil {
fmt.Println(err.Error()) fmt.Println(err.Error())
log.Println(err.Error()) log.Println(err.Error())
os.Exit(1) os.Exit(1)
} }
}
if err := checkSettings(&configuration); err != nil { if err := checkSettings(&configuration); err != nil {
log.Println("Settings is invalid! ", err.Error()) log.Println("Settings is invalid! ", err.Error())