Rename zed-server to collab
Over time, I think we may end up having multiple services, so it seems like a good opportunity to name this one more specifically while the cost is low. It just seems like naming it "zed" and "zed-server" leaves it a bit open ended.
4
.gitignore
vendored
|
@ -3,6 +3,6 @@
|
|||
.DS_Store
|
||||
/script/node_modules
|
||||
/styles/node_modules
|
||||
/crates/server/.env.toml
|
||||
/crates/server/static/styles.css
|
||||
/crates/collab/.env.toml
|
||||
/crates/collab/static/styles.css
|
||||
/vendor/bin
|
||||
|
|
106
Cargo.lock
generated
|
@ -1067,6 +1067,59 @@ dependencies = [
|
|||
"objc",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "collab"
|
||||
version = "0.1.0"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"async-io",
|
||||
"async-sqlx-session",
|
||||
"async-std",
|
||||
"async-trait",
|
||||
"async-tungstenite",
|
||||
"base64 0.13.0",
|
||||
"clap 3.0.0-beta.2",
|
||||
"client",
|
||||
"collections",
|
||||
"comrak",
|
||||
"ctor",
|
||||
"editor",
|
||||
"either",
|
||||
"env_logger 0.8.3",
|
||||
"envy",
|
||||
"futures",
|
||||
"gpui",
|
||||
"handlebars",
|
||||
"http-auth-basic",
|
||||
"json_env_logger",
|
||||
"jwt-simple",
|
||||
"language",
|
||||
"lazy_static",
|
||||
"lipsum",
|
||||
"log",
|
||||
"lsp",
|
||||
"oauth2",
|
||||
"oauth2-surf",
|
||||
"parking_lot",
|
||||
"project",
|
||||
"rand 0.8.3",
|
||||
"rpc",
|
||||
"rust-embed",
|
||||
"scrypt",
|
||||
"serde",
|
||||
"serde_json",
|
||||
"settings",
|
||||
"sha-1 0.9.6",
|
||||
"sqlx 0.5.5",
|
||||
"surf",
|
||||
"tide",
|
||||
"tide-compress",
|
||||
"time 0.2.27",
|
||||
"toml",
|
||||
"util",
|
||||
"workspace",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "collections"
|
||||
version = "0.1.0"
|
||||
|
@ -6136,59 +6189,6 @@ dependencies = [
|
|||
"workspace",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "zed-server"
|
||||
version = "0.1.0"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"async-io",
|
||||
"async-sqlx-session",
|
||||
"async-std",
|
||||
"async-trait",
|
||||
"async-tungstenite",
|
||||
"base64 0.13.0",
|
||||
"clap 3.0.0-beta.2",
|
||||
"client",
|
||||
"collections",
|
||||
"comrak",
|
||||
"ctor",
|
||||
"editor",
|
||||
"either",
|
||||
"env_logger 0.8.3",
|
||||
"envy",
|
||||
"futures",
|
||||
"gpui",
|
||||
"handlebars",
|
||||
"http-auth-basic",
|
||||
"json_env_logger",
|
||||
"jwt-simple",
|
||||
"language",
|
||||
"lazy_static",
|
||||
"lipsum",
|
||||
"log",
|
||||
"lsp",
|
||||
"oauth2",
|
||||
"oauth2-surf",
|
||||
"parking_lot",
|
||||
"project",
|
||||
"rand 0.8.3",
|
||||
"rpc",
|
||||
"rust-embed",
|
||||
"scrypt",
|
||||
"serde",
|
||||
"serde_json",
|
||||
"settings",
|
||||
"sha-1 0.9.6",
|
||||
"sqlx 0.5.5",
|
||||
"surf",
|
||||
"tide",
|
||||
"tide-compress",
|
||||
"time 0.2.27",
|
||||
"toml",
|
||||
"util",
|
||||
"workspace",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "zeroize"
|
||||
version = "1.3.0"
|
||||
|
|
14
Dockerfile
|
@ -14,20 +14,20 @@ RUN --mount=type=cache,target=./script/node_modules \
|
|||
RUN --mount=type=cache,target=./script/node_modules \
|
||||
script/build-css --release
|
||||
|
||||
# Compile server
|
||||
# Compile collab server
|
||||
RUN --mount=type=cache,target=./script/node_modules \
|
||||
--mount=type=cache,target=/usr/local/cargo/registry \
|
||||
--mount=type=cache,target=./target \
|
||||
cargo build --release --package zed-server --bin zed-server
|
||||
cargo build --release --package collab --bin collab
|
||||
|
||||
# Copy server binary out of cached directory
|
||||
# Copy collab server binary out of cached directory
|
||||
RUN --mount=type=cache,target=./target \
|
||||
cp /app/target/release/zed-server /app/zed-server
|
||||
cp /app/target/release/collab /app/collab
|
||||
|
||||
# Copy server binary to the runtime image
|
||||
# Copy collab server binary to the runtime image
|
||||
FROM debian:bullseye-slim as runtime
|
||||
RUN apt-get update; \
|
||||
apt-get install -y --no-install-recommends libcurl4-openssl-dev ca-certificates
|
||||
WORKDIR app
|
||||
COPY --from=builder /app/zed-server /app
|
||||
ENTRYPOINT ["/app/zed-server"]
|
||||
COPY --from=builder /app/collab /app
|
||||
ENTRYPOINT ["/app/collab"]
|
||||
|
|
|
@ -11,5 +11,5 @@ RUN apt-get update; \
|
|||
apt-get install -y --no-install-recommends libssl1.1
|
||||
WORKDIR app
|
||||
COPY --from=builder /app/bin/sqlx /app
|
||||
COPY ./server/migrations /app/migrations
|
||||
COPY ./collab/migrations /app/migrations
|
||||
ENTRYPOINT ["/app/sqlx", "migrate", "run"]
|
||||
|
|
2
Procfile
|
@ -1,2 +1,2 @@
|
|||
web: cd ../zed.dev && PORT=3000 npx next dev
|
||||
collab: cd crates/server && cargo run
|
||||
collab: cd crates/collab && cargo run
|
||||
|
|
|
@ -23,7 +23,7 @@ script/sqlx migrate run
|
|||
script/seed-db
|
||||
```
|
||||
|
||||
Run `zed.dev` and the collaboration server.
|
||||
Run the web frontend and the collaboration server.
|
||||
|
||||
```
|
||||
brew install foreman
|
||||
|
|
|
@ -1,12 +1,12 @@
|
|||
[package]
|
||||
authors = ["Nathan Sobo <nathan@warp.dev>"]
|
||||
default-run = "zed-server"
|
||||
default-run = "collab"
|
||||
edition = "2021"
|
||||
name = "zed-server"
|
||||
name = "collab"
|
||||
version = "0.1.0"
|
||||
|
||||
[[bin]]
|
||||
name = "zed-server"
|
||||
name = "collab"
|
||||
|
||||
[[bin]]
|
||||
name = "seed"
|
|
@ -1,2 +1,2 @@
|
|||
web: ./target/release/zed-server
|
||||
collab: ./target/release/collab
|
||||
release: ./target/release/sqlx migrate run
|
Before Width: | Height: | Size: 15 KiB After Width: | Height: | Size: 15 KiB |
Before Width: | Height: | Size: 2.6 KiB After Width: | Height: | Size: 2.6 KiB |
Before Width: | Height: | Size: 7.5 KiB After Width: | Height: | Size: 7.5 KiB |
Before Width: | Height: | Size: 2.7 KiB After Width: | Height: | Size: 2.7 KiB |
Before Width: | Height: | Size: 662 B After Width: | Height: | Size: 662 B |
Before Width: | Height: | Size: 1.1 KiB After Width: | Height: | Size: 1.1 KiB |
Before Width: | Height: | Size: 12 KiB After Width: | Height: | Size: 12 KiB |
Before Width: | Height: | Size: 695 B After Width: | Height: | Size: 695 B |
Before Width: | Height: | Size: 3.4 KiB After Width: | Height: | Size: 3.4 KiB |
Before Width: | Height: | Size: 3.5 KiB After Width: | Height: | Size: 3.5 KiB |
Before Width: | Height: | Size: 3.7 KiB After Width: | Height: | Size: 3.7 KiB |
Before Width: | Height: | Size: 7.6 KiB After Width: | Height: | Size: 7.6 KiB |