Skip to content

chore: fix merge conflicts #2634

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.

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

chore: fix merge conflicts #2634

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 0 additions & 1 deletion docker/dev-full/rivet-client/config.jsonc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
{
"client": {
"runner": {
"flavor": "container",
// Resource constraints are not supported in Docker
// TODO: Needs further investigation in to why nested cgroups v2 resource constraints aren't working
"use_resource_constraints": false,
Expand Down
6 changes: 3 additions & 3 deletions docker/universal/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,10 +47,10 @@ RUN \
--mount=type=cache,target=/root/.cache,id=universal-user-cache \
--mount=type=cache,target=/root/.npm,id=universal-user-npm \
--mount=type=cache,target=/root/.yarn,id=universal-user-yarn \
RUSTFLAGS="--cfg tokio_unstable" RIVET_BUILD_HUB=0 cargo build --bin rivet-server --bin rivet-edge-server --bin rivet-guard --bin rivet-client --bin rivet-isolate-v8-runner --bin rivet-container-runner && \
RUSTFLAGS="--cfg tokio_unstable" RIVET_BUILD_HUB=0 cargo build --bin rivet-server --bin rivet-edge-server --bin rivet-guard --bin rivet-client --bin rivet-container-runner && \
# cargo install --locked tokio-console && \
mkdir /app/dist/ && \
cp target/debug/rivet-server target/debug/rivet-edge-server target/debug/rivet-guard target/debug/rivet-client target/debug/rivet-isolate-v8-runner target/debug/rivet-container-runner /app/dist/
cp target/debug/rivet-server target/debug/rivet-edge-server target/debug/rivet-guard target/debug/rivet-client target/debug/rivet-container-runner /app/dist/

# MARK: Server (full, base)
FROM debian:12.9-slim AS server-full-base
Expand Down Expand Up @@ -205,7 +205,7 @@ COPY ./docker/monolith/rivet-client /etc/rivet-client

# === Copy Build Artifacts ===
COPY --from=builder /app/dist/rivet-server /usr/local/bin/
COPY --from=builder /app/dist/rivet-client /app/dist/rivet-isolate-v8-runner /app/dist/rivet-container-runner /usr/local/bin/
COPY --from=builder /app/dist/rivet-client /app/dist/rivet-container-runner /usr/local/bin/

VOLUME ["/data"]

Expand Down
71 changes: 0 additions & 71 deletions examples/system-test-actor/src/container/main.ts
View file
Open in desktop

This file was deleted.

20 changes: 20 additions & 0 deletions examples/system-test-actor/src/main.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,3 +20,23 @@ createAndStartUdpServer();
if (process.env.MULTI) {
connectToManager();
}

// TOOD: move this cleaner plac
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There's a typo in the comment: TOOD: move this cleaner plac should be TODO: move this to a cleaner place. The comment appears to be incomplete and could benefit from more clarity about what needs to be moved and why.

Suggested change
// TOOD: move this cleaner plac
// TODO: move this to a cleaner place

Spotted by Diamond

Is this helpful? React 👍 or 👎 to let us know.

// async function contactApi() {
// console.log('Contacting', process.env.RIVET_API_ENDPOINT);
// const res = await fetch(process.env.RIVET_API_ENDPOINT!);
// console.log('API response', res.ok, res.status);
// }
//
// contactApi();

// TODO: Move this cleaner place
// Print hosts file contents before starting
// try {
// const hostsContent = fs.readFileSync('/etc/hosts', 'utf8');
// console.log('=== /etc/hosts contents ===');
// console.log(hostsContent);
// console.log('=== End of /etc/hosts ===');
// } catch (err) {
// console.error('Failed to read /etc/hosts:', err);
// }
14 changes: 7 additions & 7 deletions examples/system-test-actor/tests/client.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,13 +44,13 @@ async function run() {
guard: {},
},
},
// udp: {
// protocol: "udp",
// // internalPort: 80,
// routing: {
// host: {},
// },
// },
udp: {
protocol: "udp",
// internalPort: 80,
routing: {
host: {},
},
},
},
},
runtime: {
Expand Down
6 changes: 0 additions & 6 deletions ...e/services/cluster/src/workflows/server/install/install_scripts/files/pegboard_install.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,6 @@ if [ "__FLAVOR__" = "container" ]; then
chmod +x /usr/local/bin/rivet-container-runner
fi

if [ "__FLAVOR__" = "isolate" ]; then
echo 'Downloading pegboard isolate runner'
curl -Lf -o /usr/local/bin/rivet-isolate-v8-runner "__ISOLATE_V8_RUNNER_BINARY_URL__"
chmod +x /usr/local/bin/rivet-isolate-v8-runner
fi

# For clarity
FDB_VERSION="__FDB_VERSION__"

Expand Down
2 changes: 1 addition & 1 deletion packages/edge/infra/client/manager/src/runner/oci_config.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -256,7 +256,7 @@ fn mounts(opts: &ConfigOpts) -> Result<serde_json::Value> {
{
"destination": "/etc/hosts",
"type": "bind",
"source": opts.actor_path.join("hosts").to_str().context("hosts path")?,
"source": opts.runner_path.join("hosts").to_str().context("hosts path")?,
"options": ["rbind", "rprivate"]
},

Expand Down
2 changes: 1 addition & 1 deletion packages/toolchain/toolchain/src/util/docker/build_remote.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -655,7 +655,7 @@ async fn poll_build_status(
&ctx,
crate::util::actor::logs::TailOpts {
environment: CI_ENVIRONMENT_ID,
actor_id,
actor_id: actor_id.to_string(),
stream: crate::util::actor::logs::LogStream::All,
follow: true,
print_type: crate::util::actor::logs::PrintType::Custom(
Expand Down
1 change: 1 addition & 0 deletions scripts/release/docker.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ const REPOS = [
{ name: "rivetgg/rivet-server", prefix: "slim", main: true },
{ name: "rivetgg/rivet-server", prefix: "full" },
{ name: "rivetgg/rivet-client", prefix: "full", main: true },
{ name: "rivetgg/rivet-client", prefix: "container-runner" },
//{ name: "rivetgg/rivet", prefix: "monolith", main: true },
]

Expand Down
Loading