diff --git a/Dockerfile b/Dockerfile index 5d5bb94..5fe2664 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:latest +FROM timothyye/alpine:3.6-glibc MAINTAINER Timothy RUN apk add --update ca-certificates RUN mkdir -p /usr/local/godns @@ -6,4 +6,4 @@ COPY godns /usr/local/godns RUN chmod +x /usr/local/godns/godns RUN rm -rf /var/cache/apk/* WORKDIR /usr/local/godns -ENTRYPOINT ["./godns", "-d"] +ENTRYPOINT ["./godns", "-c", "/usr/local/godns/config.json"] diff --git a/godns.go b/godns.go index c643472..b687425 100644 --- a/godns.go +++ b/godns.go @@ -20,7 +20,6 @@ const ( var ( configuration Settings 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") panicCount = 0 ) @@ -32,30 +31,11 @@ func main() { 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 - if err := LoadSettings(*optConf, &configuration); err != nil { - fmt.Println(err.Error()) - log.Println(err.Error()) - os.Exit(1) - } + //Load settings from configurations file + if err := LoadSettings(*optConf, &configuration); err != nil { + fmt.Println(err.Error()) + log.Println(err.Error()) + os.Exit(1) } if err := checkSettings(&configuration); err != nil {