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

chore: Remove extra opt and fix 'proxy' alias#7413

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to ourterms of service andprivacy statement. We’ll occasionally send you account related emails.

Already on GitHub?Sign in to your account

Merged
Emyrk merged 4 commits intomainfromstevenmasley/proxy_opts
May 5, 2023
Merged
Show file tree
Hide file tree
Changes fromall commits
Commits
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletioncodersdk/deployment.go
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -1352,7 +1352,7 @@ when required by your organization's security policy.`,
Description: "Whether Coder only allows connections to workspaces via the browser.",
Flag: "browser-only",
Env: "CODER_BROWSER_ONLY",
Annotations: clibase.Annotations{}.Mark(annotationEnterpriseKey, "true").Mark(annotationExternalProxies, "true"),
Annotations: clibase.Annotations{}.Mark(annotationEnterpriseKey, "true"),
Value: &c.BrowserOnly,
Group: &deploymentGroupNetworking,
YAML: "browserOnly",
Expand Down
2 changes: 1 addition & 1 deletionenterprise/cli/workspaceproxy.go
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -16,7 +16,7 @@ func (r *RootCmd) workspaceProxy() *clibase.Cmd {
cmd := &clibase.Cmd{
Use: "workspace-proxy",
Short: "Manage workspace proxies",
Aliases: []string{"proxy"},
Aliases: []string{"wsproxy"},
Hidden: true,
Handler: func(inv *clibase.Invocation) error {
return inv.Command.HelpHandler(inv)
Expand Down
6 changes: 3 additions & 3 deletionsenterprise/cli/workspaceproxy_test.go
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -45,7 +45,7 @@ func Test_ProxyCRUD(t *testing.T) {
ctx := testutil.Context(t, testutil.WaitLong)
inv, conf := newCLI(
t,
"proxy", "create",
"wsproxy", "create",
"--name", expectedName,
"--display-name", "Test Proxy",
"--icon", "/emojis/1f4bb.png",
Expand All@@ -68,7 +68,7 @@ func Test_ProxyCRUD(t *testing.T) {
// Fetch proxies and check output
inv, conf = newCLI(
t,
"proxy", "ls",
"wsproxy", "ls",
)

pty = ptytest.New(t)
Expand DownExpand Up@@ -118,7 +118,7 @@ func Test_ProxyCRUD(t *testing.T) {

inv, conf := newCLI(
t,
"proxy", "delete", expectedName,
"wsproxy", "delete", expectedName,
)

pty := ptytest.New(t)
Expand Down
6 changes: 3 additions & 3 deletionsscripts/develop.sh
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -181,11 +181,11 @@ fatal() {
log "Using external workspace proxy"
(
# Attempt to delete the proxy first, in case it already exists.
"${CODER_DEV_SHIM}"proxy delete local-proxy || true
"${CODER_DEV_SHIM}"wsproxy delete local-proxy || true
# Create the proxy
proxy_session_token=$("${CODER_DEV_SHIM}"proxy create --name=local-proxy --display-name="Local Proxy" --icon="/emojis/1f4bb.png" --only-token)
proxy_session_token=$("${CODER_DEV_SHIM}"wsproxy create --name=local-proxy --display-name="Local Proxy" --icon="/emojis/1f4bb.png" --only-token)
# Start the proxy
start_cmd PROXY "" "${CODER_DEV_SHIM}"proxy server --http-address=localhost:3010 --proxy-session-token="${proxy_session_token}" --primary-access-url=http://localhost:3000
start_cmd PROXY "" "${CODER_DEV_SHIM}"wsproxy server --http-address=localhost:3010 --proxy-session-token="${proxy_session_token}" --primary-access-url=http://localhost:3000
) || echo "Failed to create workspace proxy. No workspace proxy created."
fi

Expand Down
2 changes: 1 addition & 1 deletionscripts/linux-pkg/coder-workspace-proxy.service
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -22,7 +22,7 @@ CapabilityBoundingSet=CAP_SYSLOG CAP_IPC_LOCK CAP_NET_BIND_SERVICE
KillSignal=SIGINT
KillMode=mixed
NoNewPrivileges=yes
ExecStart=/usr/bin/coder proxy server
ExecStart=/usr/bin/coderworkspace-proxy server
Restart=on-failure
RestartSec=5
TimeoutStopSec=90
Expand Down
[8]ページ先頭
©2009-2025 Movatter.jp