Skip to content

Commit

Permalink
chore: reorg binary names for rivet-server and rivet-client (#1308)
Browse files Browse the repository at this point in the history
<!-- Please make sure there is an issue that this PR is correlated to. -->

## Changes

<!-- If there are frontend changes, please include screenshots. -->
  • Loading branch information
NathanFlurry committed Nov 4, 2024
1 parent b577339 commit 74c4f00
Show file tree
Hide file tree
Showing 99 changed files with 275 additions and 245 deletions.
172 changes: 93 additions & 79 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 7 additions & 5 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
[workspace]
resolver = "2"
# Find all packages with: find . -name Cargo.toml | grep -v resources | grep -v "sdks/runtime" | grep -v "sdks/full/rust-cli" | grep -v "infra/" | sed -E 's|^./(.*)Cargo\.toml$|"\1",|'
# Find all packages with: find . -name Cargo.toml | grep -v resources | grep -v "sdks/runtime" | grep -v "sdks/full/rust-cli" | grep -v "infra/client/" | grep -v "infra/legacy/job-runner" | sed -E 's|^./(.*)Cargo\.toml$|"\1",|'
members = [
"sdks/full/rust/",
"packages/cli/",
"packages/infra/server/",
"packages/common/operation/core/",
"packages/common/operation/macros/",
"packages/common/metrics/",
Expand All @@ -26,7 +26,7 @@ members = [
"packages/common/chirp/worker-attributes/",
"packages/common/chirp/client/",
"packages/common/runtime/",
"packages/common/server/",
"packages/common/service-manager/",
"packages/common/redis-util/",
"packages/common/env/",
"packages/common/types-proto/core/",
Expand Down Expand Up @@ -83,7 +83,6 @@ members = [
"packages/api/games/",
"packages/api/actor/",
"packages/api/monolith-public/",
"packages/services/admin/standalone/default-login",
"packages/services/token/ops/exchange/",
"packages/services/token/ops/revoke/",
"packages/services/token/ops/get/",
Expand All @@ -107,6 +106,9 @@ members = [
"packages/services/ds/",
"packages/services/linode/",
"packages/services/linode/standalone/gc/",
"packages/services/admin/",
"packages/services/admin/standalone/default-login/",
"packages/services/admin/worker/",
"packages/services/load-test/standalone/api-cloud/",
"packages/services/load-test/standalone/watch-requests/",
"packages/services/load-test/standalone/sqlx/",
Expand Down Expand Up @@ -283,7 +285,7 @@ members = [
"packages/services/custom-user-avatar/ops/list-for-game/",
"packages/services/custom-user-avatar/ops/upload-complete/",
"packages/services/debug/ops/email-res/",
"packages/services/tier/", "packages/services/admin",
"packages/services/tier/",
]

# Speed up compilation
Expand Down
12 changes: 6 additions & 6 deletions docker/dev-full/client.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -10,17 +10,17 @@ COPY . .
RUN \
--mount=type=cache,target=/usr/local/cargo/git \
--mount=type=cache,target=/usr/local/cargo/registry \
--mount=type=cache,target=/app/packages/infra/pegboard/target \
cd packages/infra/pegboard && \
RUSTFLAGS="--cfg tokio_unstable" cargo build --bin pegboard-manager --bin pegboard-isolate-runner-v8 && \
--mount=type=cache,target=/app/packages/infra/client/target \
cd packages/infra/client && \
RUSTFLAGS="--cfg tokio_unstable" cargo build --bin rivet-client --bin rivet-isolate-v8-runner --bin rivet-container-runner && \
mkdir -p /app/dist && \
mv target/debug/pegboard-manager target/debug/pegboard-isolate-runner-v8 /app/dist/
mv target/debug/rivet-client target/debug/rivet-isolate-v8-runner target/debug/rivet-container-runner /app/dist/

# MARK: Runner
#
# Requires OpenSSL 1.1, so we pin this to Debian 11 instead of 12 (which uses OpenSSL 3).
FROM debian:11-slim
RUN DEBIAN_FRONTEND=noninteractive apt-get update -y && apt-get install -y --no-install-recommends ca-certificates openssl
COPY --from=builder /app/dist/pegboard-manager /app/dist/pegboard-isolate-runner-v8 /usr/local/bin/
ENTRYPOINT ["pegboard-manager", "-c", "/etc/pegboard/config.json"]
COPY --from=builder /app/dist/rivet-client /app/dist/rivet-isolate-v8-runner /app/dist/rivet-container-runner /usr/local/bin/
ENTRYPOINT ["rivet-client", "-c", "/etc/rivet-client/config.json"]

10 changes: 5 additions & 5 deletions docker/dev-full/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ services:
build:
context: ../..
dockerfile: docker/dev-full/server.Dockerfile
command: /usr/bin/rivet server
command: /usr/bin/rivet-server start
environment:
- RUST_BACKTRACE=1
stop_grace_period: 0s
Expand All @@ -30,7 +30,7 @@ services:
vector:
condition: service_started
volumes:
- ./rivet-server:/etc/rivet:ro
- ./rivet-server:/etc/rivet-server:ro
networks:
- rivet-network
healthcheck:
Expand All @@ -48,7 +48,7 @@ services:
- RUST_BACKTRACE=1
stop_grace_period: 0s
volumes:
- ./rivet-server:/etc/rivet:ro
- ./rivet-server:/etc/rivet-server:ro
networks:
- rivet-network

Expand All @@ -61,8 +61,8 @@ services:
privileged: true
stop_grace_period: 0s
volumes:
- ./rivet-client:/etc/pegboard
- client-data:/var/lib/pegboard
- ./rivet-client:/etc/rivet-client
- client-data:/var/lib/rivet-client
networks:
- rivet-network

Expand Down
6 changes: 3 additions & 3 deletions docker/dev-full/server.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ RUN \
--mount=type=cache,target=/usr/local/cargo/git \
--mount=type=cache,target=/usr/local/cargo/registry \
--mount=type=cache,target=/app/target \
RUSTFLAGS="--cfg tokio_unstable" cargo build --bin rivet && \
mv target/debug/rivet /usr/bin/rivet && \
mkdir /etc/rivet
RUSTFLAGS="--cfg tokio_unstable" cargo build --bin rivet-server && \
mv target/debug/rivet-server /usr/bin/rivet-server && \
mkdir /etc/rivet-server

Loading

0 comments on commit 74c4f00

Please sign in to comment.