Skip to content

Commit a8976d7

Browse files
kylecarbskylecarbs
committed
Merge branch 'main' into realip
2 parents 39f35f5 + d0fb054 commit a8976d7

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+1589
-1233
lines changed

‎Dockerfile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,7 @@ LABEL \
1212
org.opencontainers.image.description="A tool for provisioning self-hosted development environments with Terraform." \
1313
org.opencontainers.image.url="https://github.com/coder/coder" \
1414
org.opencontainers.image.source="https://github.com/coder/coder" \
15-
org.opencontainers.image.version="$CODER_VERSION" \
16-
org.opencontainers.image.licenses="AGPL-3.0"
15+
org.opencontainers.image.version="$CODER_VERSION"
1716

1817
# The coder binary is injected by scripts/build_docker.sh.
1918
COPY --chown=coder:coder --chmod=755 coder /opt/coder

‎cli/cliui/provisionerjob.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ func ProvisionerJob(ctx context.Context, writer io.Writer, opts ProvisionerJobOp
134134

135135
logs, closer, err := opts.Logs()
136136
if err != nil {
137-
return xerrors.Errorf("logs: %w", err)
137+
return xerrors.Errorf("begin streaming logs: %w", err)
138138
}
139139
defer closer.Close()
140140

‎cli/config/file.go

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,10 @@ import (
66
"path/filepath"
77
)
88

9+
const (
10+
FlagName = "global-config"
11+
)
12+
913
// Root represents the configuration directory.
1014
type Root string
1115

@@ -42,6 +46,10 @@ func (r Root) PostgresPort() File {
4246
return File(filepath.Join(r.PostgresPath(), "port"))
4347
}
4448

49+
func (r Root) DeploymentConfigPath() string {
50+
return filepath.Join(string(r), "server.yaml")
51+
}
52+
4553
// File provides convenience methods for interacting with *os.File.
4654
type File string
4755

0 commit comments

Comments
 (0)