Skip to content
Merged
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
1 change: 1 addition & 0 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,7 @@ services:
dockerfile: ../../docker/continuum-core-vulkan.Dockerfile
additional_contexts:
avatars: ./src/models/avatars
shared: ./src/shared
shared-generated: ./src/shared/generated
args:
# --no-default-features excludes livekit-webrtc (handled by livekit-bridge).
Expand Down
4 changes: 4 additions & 0 deletions docker/continuum-core-cuda.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,10 @@ COPY . .
# from WORKDIR /app. CI must pass `build-contexts: shared-generated=./src/shared/generated`.
COPY --from=shared-generated entity_schemas.json /shared/generated/entity_schemas.json

# Model registry SSOT used by candle_adapter.rs include_str!:
# ../../../../shared/models.json resolves to /shared/models.json here.
COPY --from=shared models.json /shared/models.json

# Fail fast if the host forgot to init submodules. Without this, cmake's
# CMakeLists-not-found error surfaces deep inside the CUDA build —
# terrible signal-to-noise. See issue #893.
Expand Down
4 changes: 4 additions & 0 deletions docker/continuum-core-vulkan.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,10 @@ COPY . .
# CI must pass `build-contexts: shared-generated=./src/shared/generated`.
COPY --from=shared-generated entity_schemas.json /shared/generated/entity_schemas.json

# Model registry SSOT used by candle_adapter.rs include_str!:
# ../../../../shared/models.json resolves to /shared/models.json here.
COPY --from=shared models.json /shared/models.json

# Fail fast if submodules are uninitialized.
RUN test -f vendor/llama.cpp/CMakeLists.txt || ( \
echo "ERROR: vendor/llama.cpp is empty — host submodule not initialized." >&2 && \
Expand Down
5 changes: 5 additions & 0 deletions docker/continuum-core.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,11 @@ COPY . .
# which resolves to /shared/generated/ from WORKDIR /app
COPY --from=shared-generated entity_schemas.json /shared/generated/entity_schemas.json

# src/shared/models.json is the model-registry SSOT. candle_adapter.rs embeds it
# via include_str!("../../../../shared/models.json"), which resolves to
# /shared/models.json from this Docker build layout.
COPY --from=shared models.json /shared/models.json

# Fail fast if the host forgot to init submodules. Without this, cmake's
# CMakeLists-not-found error surfaces ~15 min into the cargo build —
# terrible signal-to-noise. See issue #893.
Expand Down
2 changes: 2 additions & 0 deletions scripts/push-image.sh
Original file line number Diff line number Diff line change
Expand Up @@ -275,6 +275,7 @@ docker buildx build \
--file "$DOCKERFILE" \
--build-arg "GPU_FEATURES=$GPU_FEATURES" \
--build-arg "GIT_SHA=$BUILD_SHA" \
--build-context "shared=src/shared" \
--build-context "shared-generated=src/shared/generated" \
--tag "$TAG_SHA" \
--label "org.opencontainers.image.revision=$BUILD_SHA" \
Expand All @@ -298,6 +299,7 @@ docker buildx build \
--file "$DOCKERFILE" \
--build-arg "GPU_FEATURES=$GPU_FEATURES" \
--build-arg "GIT_SHA=$BUILD_SHA" \
--build-context "shared=src/shared" \
--build-context "shared-generated=src/shared/generated" \
"${TAGS[@]}" \
--label "org.opencontainers.image.revision=$BUILD_SHA" \
Expand Down
Loading