From 2d85fcfcc30d61ba1d2cbfb7a0102ea88702bf3a Mon Sep 17 00:00:00 2001 From: braginini Date: Sat, 17 Jul 2021 17:26:51 +0200 Subject: [PATCH] refactor: set default flags in code not Dockerfile --- cmd/management.go | 12 ++++++++---- management/Dockerfile | 1 - 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/cmd/management.go b/cmd/management.go index c69ce9d83..3360c809a 100644 --- a/cmd/management.go +++ b/cmd/management.go @@ -44,7 +44,9 @@ var ( if _, err := os.Stat(mgmtDataDir); os.IsNotExist(err) { err = os.MkdirAll(mgmtDataDir, os.ModeDir) - log.Fatalf("failed creating datadir: %s: %v", mgmtDataDir, err) + if err != nil { + log.Fatalf("failed creating datadir: %s: %v", mgmtDataDir, err) + } } var opts []grpc.ServerOption @@ -55,7 +57,9 @@ var ( if _, err := os.Stat(certDir); os.IsNotExist(err) { err = os.MkdirAll(certDir, os.ModeDir) - log.Fatalf("failed creating Let's encrypt certdir: %s: %v", certDir, err) + if err != nil { + log.Fatalf("failed creating Let's encrypt certdir: %s: %v", certDir, err) + } } log.Infof("running with Let's encrypt with domain %s. Cert will be stored in %s", mgmtLetsencryptDomain, certDir) @@ -111,6 +115,6 @@ func init() { mgmtCmd.Flags().StringVar(&mgmtDataDir, "datadir", "/var/lib/wiretrustee/", "server data directory location") mgmtCmd.Flags().StringVar(&mgmtLetsencryptDomain, "letsencrypt-domain", "", "a domain to issue Let's Encrypt certificate for. Enables TLS using Let's Encrypt. Will fetch and renew certificate, and run the server with TLS") - _ = mgmtCmd.MarkFlagRequired("port") - _ = mgmtCmd.MarkFlagRequired("datadir") + //_ = mgmtCmd.MarkFlagRequired("port") + //_ = mgmtCmd.MarkFlagRequired("datadir") } diff --git a/management/Dockerfile b/management/Dockerfile index ecb55d7a9..1c599dbfa 100644 --- a/management/Dockerfile +++ b/management/Dockerfile @@ -1,4 +1,3 @@ FROM gcr.io/distroless/base:debug ENTRYPOINT [ "/go/bin/wiretrustee","management"] -CMD ["--log-level","DEBUG", "--datadir", "/var/lib/wiretrustee/"] COPY wiretrustee /go/bin/wiretrustee \ No newline at end of file