Merge branch 'main' into realip

coder · kylecarbs · Oct 23, 2022 · Oct 21, 2022 · Oct 23, 2022 · Oct 23, 2022
commit a8976d7b172d1cd577cfb3a128b4fb5785bf13ec
diff --git a/Dockerfile b/Dockerfile
@@ -12,8 +12,7 @@ LABEL \
 	org.opencontainers.image.description="A tool for provisioning self-hosted development environments with Terraform." \
 	org.opencontainers.image.url="https://github.com/coder/coder" \
 	org.opencontainers.image.source="https://github.com/coder/coder" \
-	org.opencontainers.image.version="$CODER_VERSION" \
-	org.opencontainers.image.licenses="AGPL-3.0"
+	org.opencontainers.image.version="$CODER_VERSION"
 
 # The coder binary is injected by scripts/build_docker.sh.
 COPY --chown=coder:coder --chmod=755 coder /opt/coder

diff --git a/cli/cliui/provisionerjob.go b/cli/cliui/provisionerjob.go
@@ -134,7 +134,7 @@ func ProvisionerJob(ctx context.Context, writer io.Writer, opts ProvisionerJobOp
 
 	logs, closer, err := opts.Logs()
 	if err != nil {
-		return xerrors.Errorf("logs: %w", err)
+		return xerrors.Errorf("begin streaming logs: %w", err)
 	}
 	defer closer.Close()
 

diff --git a/cli/config/file.go b/cli/config/file.go
@@ -6,6 +6,10 @@ import (
 	"path/filepath"
 )
 
+const (
+	FlagName = "global-config"
+)
+
 // Root represents the configuration directory.
 type Root string
 
@@ -42,6 +46,10 @@ func (r Root) PostgresPort() File {
 	return File(filepath.Join(r.PostgresPath(), "port"))
 }
 
+func (r Root) DeploymentConfigPath() string {
+	return filepath.Join(string(r), "server.yaml")
+}
+
 // File provides convenience methods for interacting with *os.File.
 type File string