diff --git a/docker-compose.yml b/docker-compose.yml index 04ceba40..b6624e5e 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -41,6 +41,7 @@ services: pid: host volumes: - ${MEMOH_CONFIG:-./config.toml}:/app/config.toml:ro + - ./conf/providers:/app/conf/providers:ro - containerd_data:/var/lib/containerd - server_cni_state:/var/lib/cni - memoh_data:/opt/memoh/data diff --git a/docker/Dockerfile.server b/docker/Dockerfile.server index 40484cd5..ec86d693 100644 --- a/docker/Dockerfile.server +++ b/docker/Dockerfile.server @@ -105,9 +105,10 @@ RUN apk add --no-cache ca-certificates tzdata wget cni-plugins iptables \ # Workspace runtime (bind-mounted into bot containers) 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/spec /app/spec +COPY --from=server-builder /build/conf/providers /app/conf/providers # Entrypoint: start containerd, then server COPY docker/server-entrypoint.sh /entrypoint.sh diff --git a/scripts/install.sh b/scripts/install.sh index ab0b47d5..ab8ed515 100755 --- a/scripts/install.sh +++ b/scripts/install.sh @@ -289,6 +289,8 @@ if [ "$CLONED_FRESH" = true ]; then echo "" echo "${GREEN}Cleaning up clone directory...${NC}" cp docker-compose.yml config.toml .env "$WORKSPACE/" + mkdir -p "$WORKSPACE/conf" + cp -r conf/providers "$WORKSPACE/conf/" if [ "$USE_CN_MIRROR" = true ]; then mkdir -p "$WORKSPACE/docker" cp docker/docker-compose.cn.yml "$WORKSPACE/docker/"