diff --git a/engine/docker/dev-host/docker-compose.yml b/engine/docker/dev-host/docker-compose.yml index 85505a101d..06b56e01bf 100644 --- a/engine/docker/dev-host/docker-compose.yml +++ b/engine/docker/dev-host/docker-compose.yml @@ -65,8 +65,8 @@ services: network_mode: host rivet-shell: build: - context: ../.. - dockerfile: docker/universal/Dockerfile + context: ../../.. + dockerfile: engine/docker/universal/Dockerfile target: engine-full args: BUILD_FRONTEND: 'true' @@ -126,8 +126,8 @@ services: network_mode: host rivet-engine: build: - context: ../.. - dockerfile: docker/universal/Dockerfile + context: ../../.. + dockerfile: engine/docker/universal/Dockerfile target: engine-full args: BUILD_FRONTEND: 'true' @@ -161,8 +161,8 @@ services: network_mode: host runner: build: - context: ../.. - dockerfile: sdks/typescript/test-runner/Dockerfile + context: ../../.. + dockerfile: engine/sdks/typescript/test-runner/Dockerfile platform: linux/amd64 restart: unless-stopped environment: diff --git a/engine/docker/dev-multidc-multinode/docker-compose.yml b/engine/docker/dev-multidc-multinode/docker-compose.yml index b2a1ff03a3..f5201df8f2 100644 --- a/engine/docker/dev-multidc-multinode/docker-compose.yml +++ b/engine/docker/dev-multidc-multinode/docker-compose.yml @@ -76,8 +76,8 @@ services: - rivet-network-dc-a rivet-shell-dc-a: build: - context: ../.. - dockerfile: docker/universal/Dockerfile + context: ../../.. + dockerfile: engine/docker/universal/Dockerfile target: engine-full args: BUILD_FRONTEND: 'true' @@ -151,8 +151,8 @@ services: - rivet-network-dc-a rivet-engine-dc-a-0: build: - context: ../.. - dockerfile: docker/universal/Dockerfile + context: ../../.. + dockerfile: engine/docker/universal/Dockerfile target: engine-full args: BUILD_FRONTEND: 'true' @@ -194,8 +194,8 @@ services: start_period: 30s rivet-engine-dc-a-1: build: - context: ../.. - dockerfile: docker/universal/Dockerfile + context: ../../.. + dockerfile: engine/docker/universal/Dockerfile target: engine-full args: BUILD_FRONTEND: 'true' @@ -235,8 +235,8 @@ services: start_period: 30s rivet-engine-dc-a-2: build: - context: ../.. - dockerfile: docker/universal/Dockerfile + context: ../../.. + dockerfile: engine/docker/universal/Dockerfile target: engine-full args: BUILD_FRONTEND: 'true' @@ -276,8 +276,8 @@ services: start_period: 30s runner-dc-a-0: build: - context: ../.. - dockerfile: sdks/typescript/test-runner/Dockerfile + context: ../../.. + dockerfile: engine/sdks/typescript/test-runner/Dockerfile platform: linux/amd64 restart: unless-stopped environment: @@ -293,8 +293,8 @@ services: - rivet-network-dc-a runner-dc-a-1: build: - context: ../.. - dockerfile: sdks/typescript/test-runner/Dockerfile + context: ../../.. + dockerfile: engine/sdks/typescript/test-runner/Dockerfile platform: linux/amd64 restart: unless-stopped environment: @@ -308,8 +308,8 @@ services: - rivet-network-dc-a runner-dc-a-2: build: - context: ../.. - dockerfile: sdks/typescript/test-runner/Dockerfile + context: ../../.. + dockerfile: engine/sdks/typescript/test-runner/Dockerfile platform: linux/amd64 restart: unless-stopped environment: @@ -343,8 +343,8 @@ services: - rivet-network-dc-b rivet-shell-dc-b: build: - context: ../.. - dockerfile: docker/universal/Dockerfile + context: ../../.. + dockerfile: engine/docker/universal/Dockerfile target: engine-full args: BUILD_FRONTEND: 'true' @@ -418,8 +418,8 @@ services: - rivet-network-dc-b rivet-engine-dc-b-0: build: - context: ../.. - dockerfile: docker/universal/Dockerfile + context: ../../.. + dockerfile: engine/docker/universal/Dockerfile target: engine-full args: BUILD_FRONTEND: 'true' @@ -459,8 +459,8 @@ services: start_period: 30s rivet-engine-dc-b-1: build: - context: ../.. - dockerfile: docker/universal/Dockerfile + context: ../../.. + dockerfile: engine/docker/universal/Dockerfile target: engine-full args: BUILD_FRONTEND: 'true' @@ -500,8 +500,8 @@ services: start_period: 30s rivet-engine-dc-b-2: build: - context: ../.. - dockerfile: docker/universal/Dockerfile + context: ../../.. + dockerfile: engine/docker/universal/Dockerfile target: engine-full args: BUILD_FRONTEND: 'true' @@ -541,8 +541,8 @@ services: start_period: 30s runner-dc-b-0: build: - context: ../.. - dockerfile: sdks/typescript/test-runner/Dockerfile + context: ../../.. + dockerfile: engine/sdks/typescript/test-runner/Dockerfile platform: linux/amd64 restart: unless-stopped environment: @@ -556,8 +556,8 @@ services: - rivet-network-dc-b runner-dc-b-1: build: - context: ../.. - dockerfile: sdks/typescript/test-runner/Dockerfile + context: ../../.. + dockerfile: engine/sdks/typescript/test-runner/Dockerfile platform: linux/amd64 restart: unless-stopped environment: @@ -571,8 +571,8 @@ services: - rivet-network-dc-b runner-dc-b-2: build: - context: ../.. - dockerfile: sdks/typescript/test-runner/Dockerfile + context: ../../.. + dockerfile: engine/sdks/typescript/test-runner/Dockerfile platform: linux/amd64 restart: unless-stopped environment: @@ -606,8 +606,8 @@ services: - rivet-network-dc-c rivet-shell-dc-c: build: - context: ../.. - dockerfile: docker/universal/Dockerfile + context: ../../.. + dockerfile: engine/docker/universal/Dockerfile target: engine-full args: BUILD_FRONTEND: 'true' @@ -681,8 +681,8 @@ services: - rivet-network-dc-c rivet-engine-dc-c-0: build: - context: ../.. - dockerfile: docker/universal/Dockerfile + context: ../../.. + dockerfile: engine/docker/universal/Dockerfile target: engine-full args: BUILD_FRONTEND: 'true' @@ -722,8 +722,8 @@ services: start_period: 30s rivet-engine-dc-c-1: build: - context: ../.. - dockerfile: docker/universal/Dockerfile + context: ../../.. + dockerfile: engine/docker/universal/Dockerfile target: engine-full args: BUILD_FRONTEND: 'true' @@ -763,8 +763,8 @@ services: start_period: 30s rivet-engine-dc-c-2: build: - context: ../.. - dockerfile: docker/universal/Dockerfile + context: ../../.. + dockerfile: engine/docker/universal/Dockerfile target: engine-full args: BUILD_FRONTEND: 'true' @@ -804,8 +804,8 @@ services: start_period: 30s runner-dc-c-0: build: - context: ../.. - dockerfile: sdks/typescript/test-runner/Dockerfile + context: ../../.. + dockerfile: engine/sdks/typescript/test-runner/Dockerfile platform: linux/amd64 restart: unless-stopped environment: @@ -819,8 +819,8 @@ services: - rivet-network-dc-c runner-dc-c-1: build: - context: ../.. - dockerfile: sdks/typescript/test-runner/Dockerfile + context: ../../.. + dockerfile: engine/sdks/typescript/test-runner/Dockerfile platform: linux/amd64 restart: unless-stopped environment: @@ -834,8 +834,8 @@ services: - rivet-network-dc-c runner-dc-c-2: build: - context: ../.. - dockerfile: sdks/typescript/test-runner/Dockerfile + context: ../../.. + dockerfile: engine/sdks/typescript/test-runner/Dockerfile platform: linux/amd64 restart: unless-stopped environment: diff --git a/engine/docker/dev-multidc/docker-compose.yml b/engine/docker/dev-multidc/docker-compose.yml index d06c0040b7..96c1878833 100644 --- a/engine/docker/dev-multidc/docker-compose.yml +++ b/engine/docker/dev-multidc/docker-compose.yml @@ -76,8 +76,8 @@ services: - rivet-network-dc-a rivet-shell-dc-a: build: - context: ../.. - dockerfile: docker/universal/Dockerfile + context: ../../.. + dockerfile: engine/docker/universal/Dockerfile target: engine-full args: BUILD_FRONTEND: 'true' @@ -150,8 +150,8 @@ services: - rivet-network-dc-a rivet-engine-dc-a: build: - context: ../.. - dockerfile: docker/universal/Dockerfile + context: ../../.. + dockerfile: engine/docker/universal/Dockerfile target: engine-full args: BUILD_FRONTEND: 'true' @@ -192,8 +192,8 @@ services: start_period: 30s runner-dc-a: build: - context: ../.. - dockerfile: sdks/typescript/test-runner/Dockerfile + context: ../../.. + dockerfile: engine/sdks/typescript/test-runner/Dockerfile platform: linux/amd64 restart: unless-stopped environment: @@ -229,8 +229,8 @@ services: - rivet-network-dc-b rivet-shell-dc-b: build: - context: ../.. - dockerfile: docker/universal/Dockerfile + context: ../../.. + dockerfile: engine/docker/universal/Dockerfile target: engine-full args: BUILD_FRONTEND: 'true' @@ -303,8 +303,8 @@ services: - rivet-network-dc-b rivet-engine-dc-b: build: - context: ../.. - dockerfile: docker/universal/Dockerfile + context: ../../.. + dockerfile: engine/docker/universal/Dockerfile target: engine-full args: BUILD_FRONTEND: 'true' @@ -343,8 +343,8 @@ services: start_period: 30s runner-dc-b: build: - context: ../.. - dockerfile: sdks/typescript/test-runner/Dockerfile + context: ../../.. + dockerfile: engine/sdks/typescript/test-runner/Dockerfile platform: linux/amd64 restart: unless-stopped environment: @@ -378,8 +378,8 @@ services: - rivet-network-dc-c rivet-shell-dc-c: build: - context: ../.. - dockerfile: docker/universal/Dockerfile + context: ../../.. + dockerfile: engine/docker/universal/Dockerfile target: engine-full args: BUILD_FRONTEND: 'true' @@ -452,8 +452,8 @@ services: - rivet-network-dc-c rivet-engine-dc-c: build: - context: ../.. - dockerfile: docker/universal/Dockerfile + context: ../../.. + dockerfile: engine/docker/universal/Dockerfile target: engine-full args: BUILD_FRONTEND: 'true' @@ -492,8 +492,8 @@ services: start_period: 30s runner-dc-c: build: - context: ../.. - dockerfile: sdks/typescript/test-runner/Dockerfile + context: ../../.. + dockerfile: engine/sdks/typescript/test-runner/Dockerfile platform: linux/amd64 restart: unless-stopped environment: diff --git a/engine/docker/dev-multinode/docker-compose.yml b/engine/docker/dev-multinode/docker-compose.yml index b9d20ed9e9..fb05f523db 100644 --- a/engine/docker/dev-multinode/docker-compose.yml +++ b/engine/docker/dev-multinode/docker-compose.yml @@ -73,8 +73,8 @@ services: - rivet-network rivet-shell: build: - context: ../.. - dockerfile: docker/universal/Dockerfile + context: ../../.. + dockerfile: engine/docker/universal/Dockerfile target: engine-full args: BUILD_FRONTEND: 'true' @@ -143,8 +143,8 @@ services: - rivet-network rivet-engine-0: build: - context: ../.. - dockerfile: docker/universal/Dockerfile + context: ../../.. + dockerfile: engine/docker/universal/Dockerfile target: engine-full args: BUILD_FRONTEND: 'true' @@ -183,8 +183,8 @@ services: start_period: 30s rivet-engine-1: build: - context: ../.. - dockerfile: docker/universal/Dockerfile + context: ../../.. + dockerfile: engine/docker/universal/Dockerfile target: engine-full args: BUILD_FRONTEND: 'true' @@ -221,8 +221,8 @@ services: start_period: 30s rivet-engine-2: build: - context: ../.. - dockerfile: docker/universal/Dockerfile + context: ../../.. + dockerfile: engine/docker/universal/Dockerfile target: engine-full args: BUILD_FRONTEND: 'true' @@ -259,8 +259,8 @@ services: start_period: 30s runner-0: build: - context: ../.. - dockerfile: sdks/typescript/test-runner/Dockerfile + context: ../../.. + dockerfile: engine/sdks/typescript/test-runner/Dockerfile platform: linux/amd64 restart: unless-stopped environment: @@ -276,8 +276,8 @@ services: - rivet-network runner-1: build: - context: ../.. - dockerfile: sdks/typescript/test-runner/Dockerfile + context: ../../.. + dockerfile: engine/sdks/typescript/test-runner/Dockerfile platform: linux/amd64 restart: unless-stopped environment: @@ -291,8 +291,8 @@ services: - rivet-network runner-2: build: - context: ../.. - dockerfile: sdks/typescript/test-runner/Dockerfile + context: ../../.. + dockerfile: engine/sdks/typescript/test-runner/Dockerfile platform: linux/amd64 restart: unless-stopped environment: diff --git a/engine/docker/dev/docker-compose.yml b/engine/docker/dev/docker-compose.yml index 313c6d0c4e..6558014a28 100644 --- a/engine/docker/dev/docker-compose.yml +++ b/engine/docker/dev/docker-compose.yml @@ -73,8 +73,8 @@ services: - rivet-network rivet-shell: build: - context: ../.. - dockerfile: docker/universal/Dockerfile + context: ../../.. + dockerfile: engine/docker/universal/Dockerfile target: engine-full args: BUILD_FRONTEND: 'true' @@ -143,8 +143,8 @@ services: - rivet-network rivet-engine: build: - context: ../.. - dockerfile: docker/universal/Dockerfile + context: ../../.. + dockerfile: engine/docker/universal/Dockerfile target: engine-full args: BUILD_FRONTEND: 'true' @@ -183,8 +183,8 @@ services: start_period: 30s runner: build: - context: ../.. - dockerfile: sdks/typescript/test-runner/Dockerfile + context: ../../.. + dockerfile: engine/sdks/typescript/test-runner/Dockerfile platform: linux/amd64 restart: unless-stopped environment: diff --git a/engine/docker/prod-file-system/docker-compose.yml b/engine/docker/prod-file-system/docker-compose.yml index 567db01d71..64a02f5865 100644 --- a/engine/docker/prod-file-system/docker-compose.yml +++ b/engine/docker/prod-file-system/docker-compose.yml @@ -1,8 +1,8 @@ services: rivet-engine: build: - context: ../.. - dockerfile: docker/universal/Dockerfile + context: ../../.. + dockerfile: engine/docker/universal/Dockerfile target: engine-full restart: unless-stopped command: /usr/bin/rivet-engine start diff --git a/engine/docker/template/src/docker-compose.ts b/engine/docker/template/src/docker-compose.ts index 71cb7b64db..7507ec74bd 100644 --- a/engine/docker/template/src/docker-compose.ts +++ b/engine/docker/template/src/docker-compose.ts @@ -171,8 +171,8 @@ export function generateDockerCompose(context: TemplateContext) { services[shellServiceName] = { build: { - context: "../..", - dockerfile: "docker/universal/Dockerfile", + context: "../../..", + dockerfile: "engine/docker/universal/Dockerfile", target: "engine-full", args: { BUILD_FRONTEND: "true", @@ -264,8 +264,8 @@ export function generateDockerCompose(context: TemplateContext) { services[serviceName] = { build: { - context: "../..", - dockerfile: "docker/universal/Dockerfile", + context: "../../..", + dockerfile: "engine/docker/universal/Dockerfile", target: "engine-full", args: { BUILD_FRONTEND: "true", @@ -324,8 +324,8 @@ export function generateDockerCompose(context: TemplateContext) { services[serviceName] = { build: { - context: "../..", - dockerfile: "sdks/typescript/test-runner/Dockerfile", + context: "../../..", + dockerfile: "engine/sdks/typescript/test-runner/Dockerfile", }, platform: "linux/amd64", restart: "unless-stopped", diff --git a/engine/sdks/typescript/test-runner/Dockerfile b/engine/sdks/typescript/test-runner/Dockerfile index 9b5b756702..bfd4872dc4 100644 --- a/engine/sdks/typescript/test-runner/Dockerfile +++ b/engine/sdks/typescript/test-runner/Dockerfile @@ -8,19 +8,19 @@ ENV CI=true # Copy and build SDK COPY package.json pnpm-lock.yaml pnpm-workspace.yaml tsup.base.ts tsconfig.base.json turbo.json . -COPY sdks/typescript/runner-protocol ./sdks/typescript/runner-protocol/ -COPY sdks/typescript/runner ./sdks/typescript/runner/ +COPY engine/sdks/typescript/runner-protocol ./engine/sdks/typescript/runner-protocol/ +COPY engine/sdks/typescript/runner ./engine/sdks/typescript/runner/ # Install dependencies -COPY sdks/typescript/test-runner/package.json ./sdks/typescript/test-runner/ +COPY engine/sdks/typescript/test-runner/package.json ./engine/sdks/typescript/test-runner/ RUN pnpm install --no-frozen-lockfile # Build the application -COPY sdks/typescript/test-runner/ ./sdks/typescript/test-runner/ +COPY engine/sdks/typescript/test-runner/ ./engine/sdks/typescript/test-runner/ RUN pnpm build -F @rivetkit/engine-test-runner # Expose the HTTP server port EXPOSE 5050 # Run the application -CMD ["node", "sdks/typescript/test-runner/dist/index.js"] +CMD ["node", "engine/sdks/typescript/test-runner/dist/index.js"]