diff --git a/Dockerfile b/Dockerfile index 7e59b667..1c2e42f1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -41,6 +41,8 @@ RUN apk --update --no-cache add \ COPY --from=builder /app/diun /usr/local/bin/diun COPY --from=builder /app/zoneinfo.zip /usr/local/go/lib/time/zoneinfo.zip +ENV DIUN_DB="/data/diun.db" + VOLUME [ "/data" ] -CMD [ "diun", "--config", "/diun.yml", "--docker" ] +CMD [ "diun", "--config", "/diun.yml" ] diff --git a/cmd/main.go b/cmd/main.go index 743d6d10..4ab77dad 100644 --- a/cmd/main.go +++ b/cmd/main.go @@ -30,7 +30,6 @@ func main() { kingpin.Flag("log-level", "Set log level.").Envar("LOG_LEVEL").Default("info").StringVar(&flags.LogLevel) kingpin.Flag("log-json", "Enable JSON logging output.").Envar("LOG_JSON").Default("false").BoolVar(&flags.LogJson) kingpin.Flag("log-caller", "Enable to add file:line of the caller.").Envar("LOG_CALLER").Default("false").BoolVar(&flags.LogCaller) - kingpin.Flag("docker", "Enable Docker mode.").Envar("DOCKER").Default("false").BoolVar(&flags.Docker) kingpin.UsageTemplate(kingpin.CompactUsageTemplate).Version(version).Author("CrazyMax") kingpin.CommandLine.Name = "diun" kingpin.CommandLine.Help = `Docker image update notifier. More info on https://github.com/crazy-max/diun` diff --git a/internal/config/config.go b/internal/config/config.go index 5f950189..9ca9690e 100644 --- a/internal/config/config.go +++ b/internal/config/config.go @@ -85,10 +85,6 @@ func Load(flags model.Flags, version string) (*Config, error) { } func (cfg *Config) validate() error { - if cfg.Flags.Docker { - cfg.Db.Path = "/data/diun.db" - } - cfg.Db.Path = utl.GetEnv("DIUN_DB", cfg.Db.Path) if cfg.Db.Path == "" { return errors.New("database path is required") diff --git a/internal/model/flags.go b/internal/model/flags.go index 8b52fa88..d4b636e8 100644 --- a/internal/model/flags.go +++ b/internal/model/flags.go @@ -7,5 +7,4 @@ type Flags struct { LogLevel string LogJson bool LogCaller bool - Docker bool }