fix: Accept CODER_CACHE_DIRECTORY with CACHE_DIRECTORY fallback

mafredri · mafredri · commit 40d00afcec65 · 2022-06-10T15:17:54.000+03:00
Fixes #2199
diff --git a/cli/server.go b/cli/server.go
@@ -68,6 +68,7 @@ func server() *cobra.Command {
 		promAddress           string
 		pprofEnabled          bool
 		pprofAddress          string
+		defaultCacheDir       = filepath.Join(os.TempDir(), "coder-cache")
 		cacheDir              string
 		dev                   bool
 		devUserEmail          string
@@ -99,6 +100,11 @@ func server() *cobra.Command {
 		Use:   "server",
 		Short: "Start a Coder server",
 		RunE: func(cmd *cobra.Command, args []string) error {
+			if cacheDir == defaultCacheDir && os.Getenv("CACHE_DIRECTORY") != "" {
+				// For compatibility with systemd.
+				cacheDir = os.Getenv("CACHE_DIRECTORY")
+			}
+
 			logger := slog.Make(sloghuman.Sink(os.Stderr))
 			buildModeDev := semver.Prerelease(buildinfo.Version()) == "-devel"
 			if verbose || buildModeDev {
@@ -473,8 +479,7 @@ func server() *cobra.Command {
 	cliflag.StringVarP(root.Flags(), &promAddress, "prometheus-address", "", "CODER_PROMETHEUS_ADDRESS", "127.0.0.1:2112", "The address to serve prometheus metrics.")
 	cliflag.BoolVarP(root.Flags(), &pprofEnabled, "pprof-enable", "", "CODER_PPROF_ENABLE", false, "Enable serving pprof metrics on the address defined by --pprof-address.")
 	cliflag.StringVarP(root.Flags(), &pprofAddress, "pprof-address", "", "CODER_PPROF_ADDRESS", "127.0.0.1:6060", "The address to serve pprof.")
-	// systemd uses the CACHE_DIRECTORY environment variable!
-	cliflag.StringVarP(root.Flags(), &cacheDir, "cache-dir", "", "CACHE_DIRECTORY", filepath.Join(os.TempDir(), "coder-cache"), "Specifies a directory to cache binaries for provision operations.")
+	cliflag.StringVarP(root.Flags(), &cacheDir, "cache-dir", "", "CODER_CACHE_DIRECTORY", defaultCacheDir, "Specifies a directory to cache binaries for provision operations. If unspecified and $CACHE_DIRECTORY is set, it will be used for compatibility with systemd.")
 	cliflag.BoolVarP(root.Flags(), &dev, "dev", "", "CODER_DEV_MODE", false, "Serve Coder in dev mode for tinkering")
 	cliflag.StringVarP(root.Flags(), &devUserEmail, "dev-admin-email", "", "CODER_DEV_ADMIN_EMAIL", "admin@coder.com", "Specifies the admin email to be used in dev mode (--dev)")
 	cliflag.StringVarP(root.Flags(), &devUserPassword, "dev-admin-password", "", "CODER_DEV_ADMIN_PASSWORD", "", "Specifies the admin password to be used in dev mode (--dev) instead of a randomly generated one")
