Skip to content

Commit 4ce0ad8

Browse files
authored
Merge branch 'main' into jsjoeio/issue-2426
2 parents b7c164c + 3ba3caa commit 4ce0ad8

File tree

4 files changed

+11
-16
lines changed

4 files changed

+11
-16
lines changed

LICENSE.txt renamed to LICENSE

File renamed without changes.

ci/build/build-release.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ main() {
2424
bundle_vscode
2525

2626
rsync ./docs/README.md "$RELEASE_PATH"
27-
rsync LICENSE.txt "$RELEASE_PATH"
27+
rsync LICENSE "$RELEASE_PATH"
2828
rsync ./lib/vscode/ThirdPartyNotices.txt "$RELEASE_PATH"
2929
}
3030

@@ -113,7 +113,7 @@ bundle_vscode() {
113113
"applicationName": "code-server",
114114
"dataFolderName": ".code-server",
115115
"win32MutexName": "codeserver",
116-
"licenseUrl": "https://github.com/coder/code-server/blob/main/LICENSE.txt",
116+
"licenseUrl": "https://github.com/coder/code-server/blob/main/LICENSE",
117117
"win32DirName": "code-server",
118118
"win32NameVersion": "code-server",
119119
"win32AppUserModelId": "coder.code-server",

ci/release-image/Dockerfile

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
# syntax=docker/dockerfile:experimental
2+
3+
FROM scratch AS packages
4+
COPY release-packages/code-server*.deb /tmp/
5+
16
FROM debian:11
27

38
RUN apt-get update \
@@ -34,9 +39,8 @@ RUN ARCH="$(dpkg --print-architecture)" && \
3439
mkdir -p /etc/fixuid && \
3540
printf "user: coder\ngroup: coder\n" > /etc/fixuid/config.yml
3641

37-
COPY release-packages/code-server*.deb /tmp/
3842
COPY ci/release-image/entrypoint.sh /usr/bin/entrypoint.sh
39-
RUN dpkg -i /tmp/code-server*$(dpkg --print-architecture).deb && rm /tmp/code-server*.deb
43+
RUN --mount=from=packages,src=/tmp,dst=/tmp/packages dpkg -i /tmp/packages/code-server*$(dpkg --print-architecture).deb
4044

4145
EXPOSE 8080
4246
# This way, if someone sets $DOCKER_USER, docker-exec will still work as

docs/MAINTAINING.md

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
- [Docker](#docker)
2020
- [Homebrew](#homebrew)
2121
- [npm](#npm)
22-
- [Syncing with Upstream VS Code](#syncing-with-upstream-vs-code)
22+
- [Syncing with upstream Code](#syncing-with-upstream-code)
2323
- [Testing](#testing)
2424
- [Documentation](#documentation)
2525
- [Troubleshooting](#troubleshooting)
@@ -214,18 +214,9 @@ We publish code-server as a npm package [here](https://www.npmjs.com/package/cod
214214

215215
This is currently automated with the release process.
216216

217-
## Syncing with Upstream VS Code
217+
## Syncing with upstream Code
218218

219-
The VS Code portion of code-server lives under [`coder/vscode`](https://github.com/coder/vscode). To update VS Code for code-server, follow these steps:
220-
221-
1. `git checkout -b vscode-update` - Create a new branch locally based off `main`
222-
2. `git fetch upstream` - Fetch upstream (VS Code)'s latest branches
223-
3. `git merge upstream/release/1.64` - Merge it locally
224-
1. replace `1.64` with the version you're upgrading to
225-
1. If there are merge conflicts, commit first, then fix them locally.
226-
4. Open a PR merging your branch (`vscode-update`) into `main` and add the code-server review team
227-
228-
Ideally, our fork stays as close to upstream as possible. See the differences between our fork and upstream [here](https://github.com/microsoft/vscode/compare/main...coder:main).
219+
Refer to the [contributing docs](https://coder.com/docs/code-server/latest/CONTRIBUTING#version-updates-to-code) for information on how to update Code within code-server.
229220

230221
## Testing
231222

0 commit comments

Comments
 (0)