Movatterモバイル変換


[0]ホーム

URL:


Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

Commitf6d6a10

Browse files
mafredrikylecarbs
authored andcommitted
fix: Accept CODER_CACHE_DIRECTORY with CACHE_DIRECTORY fallback (#2236)
Fixes#2199
1 parenta07cac9 commitf6d6a10

File tree

1 file changed

+6
-2
lines changed

1 file changed

+6
-2
lines changed

‎cli/server.go

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -473,8 +473,12 @@ func server() *cobra.Command {
473473
cliflag.StringVarP(root.Flags(),&promAddress,"prometheus-address","","CODER_PROMETHEUS_ADDRESS","127.0.0.1:2112","The address to serve prometheus metrics.")
474474
cliflag.BoolVarP(root.Flags(),&pprofEnabled,"pprof-enable","","CODER_PPROF_ENABLE",false,"Enable serving pprof metrics on the address defined by --pprof-address.")
475475
cliflag.StringVarP(root.Flags(),&pprofAddress,"pprof-address","","CODER_PPROF_ADDRESS","127.0.0.1:6060","The address to serve pprof.")
476-
// systemd uses the CACHE_DIRECTORY environment variable!
477-
cliflag.StringVarP(root.Flags(),&cacheDir,"cache-dir","","CACHE_DIRECTORY",filepath.Join(os.TempDir(),"coder-cache"),"Specifies a directory to cache binaries for provision operations.")
476+
defaultCacheDir:=filepath.Join(os.TempDir(),"coder-cache")
477+
ifdir:=os.Getenv("CACHE_DIRECTORY");dir!="" {
478+
// For compatibility with systemd.
479+
defaultCacheDir=dir
480+
}
481+
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.")
478482
cliflag.BoolVarP(root.Flags(),&dev,"dev","","CODER_DEV_MODE",false,"Serve Coder in dev mode for tinkering")
479483
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)")
480484
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")

0 commit comments

Comments
 (0)

[8]ページ先頭

©2009-2025 Movatter.jp