Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
28 changes: 0 additions & 28 deletions .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -248,34 +248,6 @@ jobs:
secret-files: |
netrc=${{ runner.temp }}/netrc

- name: Build & Push (rivetgg/client:isolate-v8-runner)
uses: docker/build-push-action@v4
with:
context: .
push: true
tags: rivetgg/rivet-client:isolate-v8-runner-${{ steps.vars.outputs.sha_short }}${{ matrix.arch_suffix }}
file: docker/universal/Dockerfile
target: isolate-v8-runner
platforms: ${{ matrix.platform }}
secrets: |
fontawesome_package_token=${{ secrets.FONTAWESOME_PACKAGE_TOKEN }}
secret-files: |
netrc=${{ runner.temp }}/netrc

- name: Build & Push (rivetgg/client:container-runner)
uses: docker/build-push-action@v4
with:
context: .
push: true
tags: rivetgg/rivet-client:container-runner-${{ steps.vars.outputs.sha_short }}${{ matrix.arch_suffix }}
file: docker/universal/Dockerfile
target: container-runner
platforms: ${{ matrix.platform }}
secrets: |
fontawesome_package_token=${{ secrets.FONTAWESOME_PACKAGE_TOKEN }}
secret-files: |
netrc=${{ runner.temp }}/netrc

- name: Build & Push (rivetgg/rivet:monolith)
uses: docker/build-push-action@v4
with:
Expand Down
22 changes: 22 additions & 0 deletions Cargo.lock

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

15 changes: 11 additions & 4 deletions docker/dev-full/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ services:
- RIVET_OTEL_ENABLED=1
- RIVET_OTEL_SAMPLER_RATIO=1
- RIVET_OTEL_ENDPOINT=http://otel-collector:4317
# - RUST_LOG=debug,hyper=info
- RUST_LOG=debug,hyper=info
stop_grace_period: 0s
ports:
# API
Expand Down Expand Up @@ -44,6 +44,8 @@ services:
interval: 2s
timeout: 10s
retries: 10
# Initial SQL migrations sometimes take time to run
start_period: 30s

rivet-edge-server:
build:
Expand All @@ -60,7 +62,7 @@ services:
- RIVET_OTEL_SAMPLER_RATIO=1
- RIVET_SERVICE_NAME=rivet-edge
- RIVET_OTEL_ENDPOINT=http://otel-collector:4317
# - RUST_LOG=debug,hyper=info
- RUST_LOG=debug,hyper=info
stop_grace_period: 0s
ports:
# API
Expand Down Expand Up @@ -138,7 +140,7 @@ services:
- RIVET_OTEL_SAMPLER_RATIO=1
- RIVET_SERVICE_NAME=rivet-guard
- RIVET_OTEL_ENDPOINT=http://otel-collector:4317
# - RUST_LOG=debug,hyper=info
- RUST_LOG=debug,hyper=info
stop_grace_period: 0s
ports:
# HTTP
Expand Down Expand Up @@ -198,22 +200,27 @@ services:
platform: linux/amd64
restart: unless-stopped
command: -c /etc/rivet-client/config.jsonc
# entrypoint: entrypoint.sh
# Required for runc & cnitool to operate
privileged: true
environment:
- RUST_BACKTRACE=1
- RUST_LOG_ANSI_COLOR=1
- RIVET_OTEL_ENABLED=1
- RIVET_OTEL_SAMPLER_RATIO=1
- RIVET_SERVICE_NAME=rivet-client
- RIVET_OTEL_ENDPOINT=http://otel-collector:4317
# - RUST_LOG=debug,hyper=info
- RUST_LOG=debug,hyper=info
stop_grace_period: 0s
depends_on:
rivet-edge-server:
condition: service_healthy
foundationdb:
condition: service_healthy
volumes:
# - ./rivet-client/entrypoint.sh:/usr/local/bin/entrypoint.sh:ro
- ./rivet-client/config.jsonc:/etc/rivet-client/config.jsonc:ro
- ./rivet-client/rivet-actor.conflist:/opt/cni/config/rivet-actor.conflist:ro
- client-data:/var/lib/rivet-client
ports:
# Enable host networking for actors
Expand Down
6 changes: 3 additions & 3 deletions docker/dev-full/rivet-client/config.jsonc
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
{
"client": {
"runner": {
"flavor": "isolate",
// Enables running in non-privileged Docker containers
"use_mounts": false
"flavor": "container",
"use_resource_constraints": false
},
"cluster": {
// This is safe to hardcode
Expand All @@ -15,6 +14,7 @@
]
}
},
// TODO: Compare this to network in cluster config
"network": {
"bind_ip": "127.0.0.1",
// Point to DNS name inside Docker container
Expand Down
Loading
Loading