Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 74934e1

Browse files
authored
docs: add file sync to coder desktop docs (#17463)
closes #16869 section could use more about: - [x] sync direction options? - [x] how to resolve conflicts - [x] EA --> Beta [preview](https://coder.com/docs/@16869-desktop-file-sync/user-guides/desktop) --------- Co-authored-by: EdwardAngert <[email protected]>
1 parent df56a13 commit 74934e1

8 files changed

+69
-17
lines changed
Loading

docs/manifest.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@
193193
"description": "Use Coder Desktop to access your workspace like it's a local machine",
194194
"path": "./user-guides/desktop/index.md",
195195
"icon_path": "./images/icons/computer-code.svg",
196-
"state": ["early access"]
196+
"state": ["beta"]
197197
},
198198
{
199199
"title": "Workspace Management",

docs/user-guides/desktop/index.md

Lines changed: 68 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Coder Desktop (Early Access)
1+
# Coder Desktop (Beta)
22

33
Use Coder Desktop to work on your workspaces as though they're on your LAN, no
44
port-forwarding required.
@@ -22,7 +22,7 @@ You can install Coder Desktop on macOS or Windows.
2222

2323
Alternatively, you can manually install Coder Desktop from the [releases page](https://github.com/coder/coder-desktop-macos/releases).
2424

25-
1. Open **Coder Desktop** from the Applications directory. When macOS asks if you want to open it, select **Open**.
25+
1. Open **Coder Desktop** from the Applications directory.
2626

2727
1. The application is treated as a system VPN. macOS will prompt you to confirm with:
2828

@@ -79,11 +79,11 @@ Before you can use Coder Desktop, you will need to sign in.
7979

8080
## macOS
8181

82-
<Image height="325px" src="../../images/user-guides/desktop/coder-desktop-mac-pre-sign-in.png" alt="Coder Desktop menu before the user signs in" align="center" />
82+
![Coder Desktop menu before the user signs in](../../images/user-guides/desktop/coder-desktop-mac-pre-sign-in.png)
8383

8484
## Windows
8585

86-
<Image height="325px" src="../../images/user-guides/desktop/coder-desktop-win-pre-sign-in.png" alt="Coder Desktop menu before the user signs in" align="center" />
86+
![Coder Desktop menu before the user signs in](../../images/user-guides/desktop/coder-desktop-win-pre-sign-in.png)
8787

8888
</div>
8989

@@ -97,19 +97,19 @@ Before you can use Coder Desktop, you will need to sign in.
9797

9898
1. In your web browser, you may be prompted to sign in to Coder with your credentials:
9999

100-
<Image height="412px" src="../../images/templates/coder-login-web.png" alt="Sign in to your Coder deployment" align="center" />
100+
![Sign in to your Coder deployment](../../images/templates/coder-login-web.png)
101101

102102
1. Copy the session token to the clipboard:
103103

104-
<Image height="350px" src="../../images/templates/coder-session-token.png" alt="Copy session token" align="center" />
104+
![Copy session token](../../images/templates/coder-session-token.png)
105105

106106
1. Paste the token in the **Session Token** field of the **Sign In** screen, then select **Sign In**:
107107

108108
![Paste the session token in to sign in](../../images/user-guides/desktop/coder-desktop-session-token.png)
109109

110-
1. macOS: Allow the VPN configuration for Coder Desktop if you are prompted.
110+
1. macOS: Allow the VPN configuration for Coder Desktop if you are prompted:
111111

112-
<Image height="350px" src="../../images/user-guides/desktop/mac-allow-vpn.png" alt="Copy session token" align="center" />
112+
![Copy session token](../../images/user-guides/desktop/mac-allow-vpn.png)
113113

114114
1. Select the Coder icon in the menu bar (macOS) or system tray (Windows), and click the **Coder Connect** toggle to enable the connection.
115115

@@ -129,28 +129,80 @@ While active, Coder Connect will list the workspaces you own and will configure
129129

130130
To copy the `.coder` hostname of a workspace agent, you can click the copy icon beside it.
131131

132-
On macOS you can use `ping6` in your terminal to verify the connection to your workspace:
132+
You can also connect to the SSH server in your workspace using any SSH client, such as OpenSSH or PuTTY:
133133

134134
```shell
135-
ping6 -c 5 your-workspace.coder
135+
ssh your-workspace.coder
136136
```
137137

138-
On Windows, you can use `ping` in a Command Prompt or PowerShell terminal to verify the connection to your workspace:
138+
Any services listening on ports in your workspace will be available on the same hostname. For example, you can access a web server on port `8080` by visiting `http://your-workspace.coder:8080` in your browser.
139+
140+
> [!NOTE]
141+
> Currently, the Coder IDE extensions for VSCode and JetBrains create their own tunnel and do not utilize the Coder Connect tunnel to connect to workspaces.
142+
143+
### Ping your workspace
144+
145+
<div class="tabs">
146+
147+
### macOS
148+
149+
Use `ping6` in your terminal to verify the connection to your workspace:
139150

140151
```shell
141-
ping -n 5 your-workspace.coder
152+
ping6 -c 5 your-workspace.coder
142153
```
143154

144-
Any services listening on ports in your workspace will be available on the same hostname. For example, you can access a web server on port `8080` by visiting `http://your-workspace.coder:8080` in your browser.
155+
### Windows
145156

146-
You can also connect to the SSH server in your workspace using any SSH client, such as OpenSSH or PuTTY:
157+
Use `ping` in a Command Prompt or PowerShell terminal to verify the connection to your workspace:
147158

148159
```shell
149-
ssh your-workspace.coder
160+
ping -n 5 your-workspace.coder
150161
```
151162

163+
</div>
164+
165+
## Sync a local directory with your workspace
166+
167+
Coder Desktop file sync provides bidirectional synchronization between a local directory and your workspace.
168+
You can work offline, add screenshots to documentation, or use local development tools while keeping your files in sync with your workspace.
169+
170+
1. Create a new local directory.
171+
172+
If you select an existing clone of your repository, Desktop will recognize it as conflicting files.
173+
174+
1. In the Coder Desktop app, select **File sync**.
175+
176+
![Coder Desktop File Sync screen](../../images/user-guides/desktop/coder-desktop-file-sync.png)
177+
178+
1. Select the **+** in the corner to select the local path, workspace, and remote path, then select **Add**:
179+
180+
![Coder Desktop File Sync add paths](../../images/user-guides/desktop/coder-desktop-file-sync-add.png)
181+
182+
1. File sync clones your workspace directory to your local directory, then watches for changes:
183+
184+
![Coder Desktop File Sync watching](../../images/user-guides/desktop/coder-desktop-file-sync-watching.png)
185+
186+
For more information about the current status, hover your mouse over the status.
187+
188+
File sync excludes version control system directories like `.git/` from synchronization, so keep your Git-cloned repository wherever you run Git commands.
189+
This means that if you use an IDE with a built-in terminal to edit files on your remote workspace, that should be the Git clone and your local directory should be for file syncs.
190+
152191
> [!NOTE]
153-
> Currently, the Coder IDE extensions for VSCode and JetBrains create their own tunnel and do not utilize the Coder Connect tunnel to connect to workspaces.
192+
> Coder Desktop uses `alpha` and `beta` to distinguish between the:
193+
>
194+
> - Local directory: `alpha`
195+
> - Remote directory: `beta`
196+
197+
### File sync conflicts
198+
199+
File sync shows a `Conflicts` status when it detects conflicting files.
200+
201+
You can hover your mouse over the status for the list of conflicts:
202+
203+
![Desktop file sync conflicts mouseover](../../images/user-guides/desktop/coder-desktop-file-sync-conflicts-mouseover.png)
204+
205+
If you encounter a synchronization conflict, delete the conflicting file that contains changes you don't want to keep.
154206

155207
## Accessing web apps in a secure browser context
156208

0 commit comments

Comments
 (0)