mirror of
https://github.com/memohai/Memoh.git
synced 2026-04-25 07:00:48 +09:00
fix(deploy): include provider presets in Docker image and install
Provider preset YAML files under conf/providers were not bundled into the server Docker image or preserved by the install script, so fresh deployments started without any pre-configured LLM providers.
This commit is contained in:
@@ -41,6 +41,7 @@ services:
|
|||||||
pid: host
|
pid: host
|
||||||
volumes:
|
volumes:
|
||||||
- ${MEMOH_CONFIG:-./config.toml}:/app/config.toml:ro
|
- ${MEMOH_CONFIG:-./config.toml}:/app/config.toml:ro
|
||||||
|
- ./conf/providers:/app/conf/providers:ro
|
||||||
- containerd_data:/var/lib/containerd
|
- containerd_data:/var/lib/containerd
|
||||||
- server_cni_state:/var/lib/cni
|
- server_cni_state:/var/lib/cni
|
||||||
- memoh_data:/opt/memoh/data
|
- memoh_data:/opt/memoh/data
|
||||||
|
|||||||
@@ -105,9 +105,10 @@ RUN apk add --no-cache ca-certificates tzdata wget cni-plugins iptables \
|
|||||||
# Workspace runtime (bind-mounted into bot containers)
|
# Workspace runtime (bind-mounted into bot containers)
|
||||||
COPY --from=toolkit-assembly /assembly /opt/memoh/runtime
|
COPY --from=toolkit-assembly /assembly /opt/memoh/runtime
|
||||||
|
|
||||||
# Server binary and spec
|
# Server binary, spec, and provider presets
|
||||||
COPY --from=server-builder /build/memoh-server /app/memoh-server
|
COPY --from=server-builder /build/memoh-server /app/memoh-server
|
||||||
COPY --from=server-builder /build/spec /app/spec
|
COPY --from=server-builder /build/spec /app/spec
|
||||||
|
COPY --from=server-builder /build/conf/providers /app/conf/providers
|
||||||
|
|
||||||
# Entrypoint: start containerd, then server
|
# Entrypoint: start containerd, then server
|
||||||
COPY docker/server-entrypoint.sh /entrypoint.sh
|
COPY docker/server-entrypoint.sh /entrypoint.sh
|
||||||
|
|||||||
@@ -289,6 +289,8 @@ if [ "$CLONED_FRESH" = true ]; then
|
|||||||
echo ""
|
echo ""
|
||||||
echo "${GREEN}Cleaning up clone directory...${NC}"
|
echo "${GREEN}Cleaning up clone directory...${NC}"
|
||||||
cp docker-compose.yml config.toml .env "$WORKSPACE/"
|
cp docker-compose.yml config.toml .env "$WORKSPACE/"
|
||||||
|
mkdir -p "$WORKSPACE/conf"
|
||||||
|
cp -r conf/providers "$WORKSPACE/conf/"
|
||||||
if [ "$USE_CN_MIRROR" = true ]; then
|
if [ "$USE_CN_MIRROR" = true ]; then
|
||||||
mkdir -p "$WORKSPACE/docker"
|
mkdir -p "$WORKSPACE/docker"
|
||||||
cp docker/docker-compose.cn.yml "$WORKSPACE/docker/"
|
cp docker/docker-compose.cn.yml "$WORKSPACE/docker/"
|
||||||
|
|||||||
Reference in New Issue
Block a user