diff --git a/Dockerfile b/Dockerfile index 7497b26..702b9e6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -42,11 +42,6 @@ ENV KAFKA_VERSION=2.4.0.0 ENV KAFKA_USERNAME= ENV KAFKA_PASSWORD= ENV KAFKA_SASL_MECHANISM=SCRAM-SHA-512 -ENV IM_ADMIN_API_BASE_URL=http://im-server:6060 -ENV IM_ADMIN_API_SECRET= -ENV IM_INTERNAL_API_BASE_URL=http://im-server:6060 -ENV IM_INTERNAL_API_SECRET= -ENV IM_CONFIG_API_SECRET= COPY --from=server-build /src/manifest ./manifest COPY --from=server-build /src/hack ./hack diff --git a/server/manifest/config/config.template b/server/manifest/config/config.template index 2afb12b..9ed23d2 100644 --- a/server/manifest/config/config.template +++ b/server/manifest/config/config.template @@ -306,17 +306,17 @@ hggen: webViewsPath: "../web/src/views/addons/{$name}" # web页面生成路径 imAdminApi: - baseUrl: "$IM_ADMIN_API_BASE_URL" + baseUrl: "http://im-server:6060" serviceId: "hotgo-admin" - serviceSecret: "$IM_ADMIN_API_SECRET" + serviceSecret: "8569f5626a54950539eece9f731c9e3bf073daa74af8d23735d19afacac40f4b" timeout: "5s" imInternalApi: - baseUrl: "$IM_INTERNAL_API_BASE_URL" + baseUrl: "http://im-server:6060" serviceName: "hotgo-admin" - serviceSecret: "$IM_INTERNAL_API_SECRET" + serviceSecret: "8569f5626a54950539eece9f731c9e3bf073daa74af8d23735d19afacac40f4b" imConfigApi: serviceName: "im-server" - serviceSecret: "$IM_CONFIG_API_SECRET" + serviceSecret: "b96832c04dbfb6dd768930ec9f082ecd90d87a1ffdaa493aa070617c48de9097" timeWindow: "300s" diff --git a/server/manifest/docker/entrypoint.sh b/server/manifest/docker/entrypoint.sh index d5e6abc..608a9fe 100644 --- a/server/manifest/docker/entrypoint.sh +++ b/server/manifest/docker/entrypoint.sh @@ -6,7 +6,7 @@ cd /app # Render the real config from the template using only the specific env vars we # expect — avoids accidentally substituting anything else that might contain a # literal '$' in the YAML. -envsubst '$MYSQL_DSN $REDIS_ADDR $REDIS_DB $REDIS_PASSWORD $TOKEN_SECRET_KEY $QUEUE_DRIVER $KAFKA_ADDRESS $KAFKA_VERSION $KAFKA_USERNAME $KAFKA_PASSWORD $KAFKA_SASL_MECHANISM $IM_ADMIN_API_BASE_URL $IM_ADMIN_API_SECRET $IM_INTERNAL_API_BASE_URL $IM_INTERNAL_API_SECRET $IM_CONFIG_API_SECRET' \ +envsubst '$MYSQL_DSN $REDIS_ADDR $REDIS_DB $REDIS_PASSWORD $TOKEN_SECRET_KEY $QUEUE_DRIVER $KAFKA_ADDRESS $KAFKA_VERSION $KAFKA_USERNAME $KAFKA_PASSWORD $KAFKA_SASL_MECHANISM' \ < manifest/config/config.template > manifest/config/config.yaml exec ./hotgo